struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] branch master updated (80045fc -> 6e96f11)
Date Sun, 22 Oct 2017 07:21:47 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from 80045fc  Tries fix tests when running on JDK9
     add 0ae6aa8  Adds missing header with license or updates the existing one
     add b37af16  Adds missing header with license or updates the existing one
     add 6e51f28  Adds missing header with license
     add 8b738bd  Adds missing header with license
     add e678792  Adds missing header with license
     add 73359c4  Adds missing header with license
     add ce335f1  Adds missing header with license
     add fd8e3bc  Adds missing header with license
     add cb3299b  Enables Rat plugin on each build
     add e7c65fb  Adds missing header with license
     add a033730  Adds missing header with license
     add 885ad89  Adds missing header with license and fixes tests
     add 38a1434  Adds missing header with license and fixes tests
     add f351e85  Uses property instead of hardcoding path
     add 1323c22  Fixes encoding
     add 88a29b3  Fixes encoding
     add d267180  Puts back JavaDoc reference
     add 3a6f485  Removes unneeded header
     add 4a1d42e  Fixes encoding
     add cd85d70  Fixes encoding
     add eafed38  Converts content to a proper CSS
     new 6e96f11  Merge pull request #175 from lukaszlenart/act-of-law

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 apps/pom.xml                                       |   2 -
 apps/rest-showcase/pom.xml                         |   2 -
 .../org/demo/rest/example/IndexController.java     |  18 ++
 .../src/main/java/org/demo/rest/example/Order.java |  18 ++
 .../org/demo/rest/example/OrdersController.java    |  18 ++
 .../java/org/demo/rest/example/OrdersService.java  |  18 ++
 apps/rest-showcase/src/main/resources/log4j2.xml   |  20 ++
 apps/rest-showcase/src/main/resources/struts.xml   |   2 -
 .../src/main/resources/velocity.properties         |  18 ++
 .../WEB-INF/content/orders-deleteConfirm.jsp       |  20 ++
 .../main/webapp/WEB-INF/content/orders-edit.jsp    |  20 ++
 .../main/webapp/WEB-INF/content/orders-editNew.jsp |  20 ++
 .../main/webapp/WEB-INF/content/orders-index.jsp   |  20 ++
 .../main/webapp/WEB-INF/content/orders-show.jsp    |  20 ++
 apps/rest-showcase/src/main/webapp/WEB-INF/web.xml |  21 +-
 apps/rest-showcase/src/main/webapp/css/app.css     |  18 ++
 .../apache/struts2/rest/example/GetOrdersTest.java |  18 ++
 .../struts2/rest/example/ListOrdersTest.java       |  18 ++
 .../struts2/rest/example/ParameterUtils.java       |  18 ++
 .../apache/struts2/rest/example/PostOrderTest.java |  18 ++
 apps/showcase/pom.xml                              |   2 -
 .../showcase/action/AbstractCRUDAction.java        |   2 -
 .../struts2/showcase/action/EmployeeAction.java    |   2 -
 .../struts2/showcase/action/ExampleAction.java     |   2 -
 .../struts2/showcase/action/JSPEvalAction.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/person/package-info.java      |  18 ++
 .../showcase/validation/AjaxFormSubmitAction.java  |  20 +-
 .../validation/AjaxFormSubmitSuccessAction.java    |  18 ++
 .../src/main/resources/globalMessages.properties   |  18 ++
 .../main/resources/globalMessages_de.properties    |  18 ++
 .../main/resources/globalMessages_en.properties    |  18 ++
 apps/showcase/src/main/resources/log4j2.xml        |  20 ++
 .../myTemplateDir/myTheme/myAnotherTemplate.ftl    |  20 ++
 .../apache/struts2/showcase/DateAction.properties  |  18 ++
 ...ction-lotsOfRichtexteditorSubmit-validation.xml |  22 +-
 .../showcase/UITagExample-conversion.properties    |  18 ++
 .../action/EmployeeAction-conversion.properties    |  18 ++
 .../showcase/action/EmployeeAction-validation.xml  |  20 ++
 .../showcase/action/EmployeeAction.properties      |  18 ++
 .../showcase/action/EmployeeAction_de.properties   |  26 +-
 .../showcase/action/EmployeeAction_en.properties   |  18 ++
 .../showcase/action/SkillAction-validation.xml     |  20 ++
 .../struts2/showcase/action/SkillAction.properties |  18 ++
 .../showcase/action/SkillAction_de.properties      |  20 +-
 .../conversion/AddressAction-conversion.properties |  19 +-
 .../OperationsEnumAction-conversion.properties     |  19 +-
 .../conversion/PersonAction-conversion.properties  |  19 ++
 .../fileupload/FileUploadAction-validation.xml     |  22 +-
 ...FileUploadUsingListAction-conversion.properties |  18 ++
 .../person/EditPersonAction-conversion.properties  |  18 ++
 .../showcase/person/NewPersonAction-validation.xml |  20 ++
 .../struts2/showcase/person/Person-validation.xml  |  20 ++
 .../IteratorGeneratorTagDemo-validation.xml        |  22 +-
 ...ldValidatorsExampleAction-conversion.properties |  18 ++
 ...ubmitClientSideValidationExample-validation.xml |  21 +-
 ...on-submitFieldValidatorsExamples-validation.xml |  21 +-
 .../FieldValidatorsExampleAction.properties        |  18 ++
 ...submitNonFieldValidatorsExamples-validation.xml |  21 +-
 .../showcase/validation/QuizAction-validation.xml  |  21 +-
 ...mitApplication-submitApplication-validation.xml |  20 ++
 .../validation/User-userContext-validation.xml     |  21 +-
 ...-submitVisitorValidatorsExamples-validation.xml |  21 +-
 .../src/main/resources/struts-actionchaining.xml   |  20 ++
 .../src/main/resources/struts-conversion.xml       |  20 ++
 .../src/main/resources/struts-filedownload.xml     |  20 ++
 .../src/main/resources/struts-fileupload.xml       |  20 ++
 .../src/main/resources/struts-freemarker.xml       |  20 ++
 .../showcase/src/main/resources/struts-hangman.xml |  20 ++
 .../src/main/resources/struts-interactive.xml      |  20 ++
 .../src/main/resources/struts-model-driven.xml     |  20 ++
 apps/showcase/src/main/resources/struts-person.xml |  20 ++
 .../src/main/resources/struts-tags-non-ui.xml      |  20 ++
 .../showcase/src/main/resources/struts-tags-ui.xml |  20 ++
 apps/showcase/src/main/resources/struts-tags.xml   |  20 ++
 apps/showcase/src/main/resources/struts-tiles.xml  |  20 ++
 apps/showcase/src/main/resources/struts-token.xml  |  20 ++
 .../src/main/resources/struts-validation.xml       |  20 ++
 apps/showcase/src/main/resources/struts-wait.xml   |  20 ++
 apps/showcase/src/main/resources/struts-xslt.xml   |  21 +-
 apps/showcase/src/main/resources/struts.xml        |  21 +-
 .../template/ajaxErrorContainers/actionerror.ftl   |   2 -
 .../template/ajaxErrorContainers/controlfooter.ftl |   2 -
 .../ajaxErrorContainers/controlheader-core.ftl     |   2 -
 .../template/ajaxErrorContainers/theme.properties  |   2 -
 .../src/main/resources/velocity.properties         |  18 ++
 .../actionchaining/actionChainingResult.jsp        |  20 ++
 .../src/main/webapp/WEB-INF/applicationContext.xml |  20 ++
 .../WEB-INF/bean-validation/bean-validation.jsp    |  20 ++
 .../webapp/WEB-INF/conversion/enterAddressInfo.jsp |  20 ++
 .../webapp/WEB-INF/conversion/enterOperations.jsp  |  20 ++
 .../webapp/WEB-INF/conversion/enterPersonInfo.jsp  |  20 ++
 .../src/main/webapp/WEB-INF/conversion/index.jsp   |  20 ++
 .../webapp/WEB-INF/conversion/showAddressInfo.jsp  |  20 ++
 .../webapp/WEB-INF/conversion/showOperations.jsp   |  20 ++
 .../webapp/WEB-INF/conversion/showPersonInfo.jsp   |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/date.jsp     |  20 ++
 .../src/main/webapp/WEB-INF/decorators.xml         |  21 +-
 .../src/main/webapp/WEB-INF/decorators/main.jsp    |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/dwr.xml      |  21 +-
 .../webapp/WEB-INF/empmanager/editEmployee.jsp     |  20 ++
 .../main/webapp/WEB-INF/empmanager/editSkill.jsp   |  20 ++
 .../webapp/WEB-INF/empmanager/listEmployees.jsp    |  20 ++
 .../main/webapp/WEB-INF/empmanager/listSkills.jsp  |  20 ++
 .../src/main/webapp/WEB-INF/filedownload/index.jsp |  20 ++
 .../fileupload/multipleUploadUsingArray.jsp        |  20 ++
 .../WEB-INF/fileupload/multipleUploadUsingList.jsp |  22 +-
 .../webapp/WEB-INF/fileupload/upload-success.jsp   |  22 +-
 .../src/main/webapp/WEB-INF/fileupload/upload.jsp  |  20 ++
 .../freemarker/customFreemarkerManagerUsage.ftl    |  20 ++
 .../src/main/webapp/WEB-INF/freemarker/index.jsp   |  20 ++
 .../webapp/WEB-INF/freemarker/standardTags.ftl     |  20 ++
 .../src/main/webapp/WEB-INF/hangman/blank.ftl      |  20 ++
 .../main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl |  20 ++
 .../WEB-INF/hangman/updateCharacterAvailable.ftl   |  20 ++
 .../webapp/WEB-INF/hangman/updateGuessLeft.ftl     |  20 ++
 .../main/webapp/WEB-INF/hangman/updateScaffold.ftl |  20 ++
 .../WEB-INF/hangman/updateVocabCharacters.ftl      |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/help.jsp     |  20 ++
 .../webapp/WEB-INF/modelDriven/modelDriven.jsp     |  20 ++
 .../WEB-INF/modelDriven/modelDrivenResult.jsp      |  20 ++
 .../src/main/webapp/WEB-INF/person/edit-person.jsp |  20 ++
 .../src/main/webapp/WEB-INF/person/list-people.ftl |  20 ++
 .../src/main/webapp/WEB-INF/person/new-person.ftl  |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/showcase.jsp |  22 +-
 .../src/main/webapp/WEB-INF/sitemesh-decorator.tld |  20 ++
 .../src/main/webapp/WEB-INF/sitemesh-page.tld      |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml |  20 ++
 .../tags/non-ui/actionPrefix/actionPrefix.ftl      |  20 ++
 .../non-ui/actionPrefix/actionPrefixExample.ftl    |  20 ++
 .../tags/non-ui/actionPrefix/methodPrefix.ftl      |  20 ++
 .../tags/non-ui/actionPrefix/normalSubmit.ftl      |  20 ++
 .../non-ui/actionPrefix/redirectActionPrefix.ftl   |  20 ++
 .../WEB-INF/tags/non-ui/actionTag/includedPage.jsp |  20 ++
 .../tags/non-ui/actionTag/includedPage2.jsp        |  21 +-
 .../tags/non-ui/actionTag/includedPage3.jsp        |  21 +-
 .../tags/non-ui/actionTag/showActionTagDemo.jsp    |  20 ++
 .../src/main/webapp/WEB-INF/tags/non-ui/date.jsp   |  20 ++
 .../src/main/webapp/WEB-INF/tags/non-ui/debug.jsp  |  20 ++
 .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl    |  20 ++
 .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp    |  20 ++
 .../iteratorTag/appendIteratorTagDemoResult.jsp    |  20 ++
 .../iteratorTag/iteratorGeneratorTagDemoResult.jsp |  20 ++
 .../iteratorTag/mergeIteratorTagDemoResult.jsp     |  20 ++
 .../iteratorTag/showAppendIteratorTagDemo.jsp      |  20 ++
 .../iteratorTag/showIteratorGeneratorTagDemo.jsp   |  20 ++
 .../iteratorTag/showMergeIteratorTagDemo.jsp       |  20 ++
 .../non-ui/iteratorTag/subsetIteratorTagDemo.jsp   |  20 ++
 .../iteratorTag/subsetIteratorTagDemoResult.jsp    |  20 ++
 .../WEB-INF/tags/ui/actionTagExampleCalled.jsp     |  20 ++
 .../WEB-INF/tags/ui/actionTagExampleCalling.jsp    |  20 ++
 .../webapp/WEB-INF/tags/ui/componentTagExample.jsp |  20 ++
 .../webapp/WEB-INF/tags/ui/dynamicTreeSelect.jsp   |  20 ++
 .../src/main/webapp/WEB-INF/tags/ui/example.jsp    |  20 ++
 .../src/main/webapp/WEB-INF/tags/ui/example.vm     |  18 ++
 .../webapp/WEB-INF/tags/ui/exampleSubmited.jsp     |  20 ++
 .../main/webapp/WEB-INF/tags/ui/exampleSubmited.vm |  18 ++
 .../WEB-INF/tags/ui/lotsOfOptiontransferselect.jsp |  20 ++
 .../tags/ui/lotsOfOptiontransferselectSubmit.jsp   |  20 ++
 .../main/webapp/WEB-INF/tags/ui/moreSelects.jsp    |  20 ++
 .../webapp/WEB-INF/tags/ui/moreSelectsSubmit.jsp   |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/tiles.xml    |   3 +-
 .../src/main/webapp/WEB-INF/tiles/body.ftl         |  20 ++
 .../src/main/webapp/WEB-INF/tiles/body.jsp         |  20 ++
 .../src/main/webapp/WEB-INF/tiles/header.jsp       |  20 ++
 .../webapp/WEB-INF/tiles/layout-annotations.jsp    |  20 ++
 .../src/main/webapp/WEB-INF/tiles/layout.ftl       |  20 ++
 .../src/main/webapp/WEB-INF/tiles/layout.jsp       |  20 ++
 .../src/main/webapp/WEB-INF/token/doublePost.jsp   |  20 ++
 .../src/main/webapp/WEB-INF/token/example1.jsp     |  20 ++
 .../src/main/webapp/WEB-INF/token/example2.jsp     |  20 ++
 .../src/main/webapp/WEB-INF/token/example3.jsp     |  20 ++
 .../src/main/webapp/WEB-INF/token/example4.ftl     |  20 ++
 .../src/main/webapp/WEB-INF/token/transferDone.jsp |  20 ++
 .../src/main/webapp/WEB-INF/validation.xml         |  21 +-
 .../webapp/WEB-INF/validation/ajaxFormSubmit.jsp   |  20 ++
 .../WEB-INF/validation/ajaxFormSubmitSuccess.jsp   |  20 ++
 .../validation/clientSideValidationExample.jsp     |  20 ++
 .../WEB-INF/validation/fieldValidatorsExample.jsp  |  22 +-
 .../validation/nonFieldValidatorsExample.jsp       |  22 +-
 .../main/webapp/WEB-INF/validation/quiz-basic.jsp  |  20 ++
 .../webapp/WEB-INF/validation/quiz-client-css.jsp  |  20 ++
 .../main/webapp/WEB-INF/validation/quiz-client.jsp |  20 ++
 .../webapp/WEB-INF/validation/quiz-success.jsp     |  20 ++
 .../validation/storeErrorsAcrossRequestCancel.jsp  |  20 ++
 .../validation/storeErrorsAcrossRequestExample.jsp |  20 ++
 .../validation/storeErrorsAcrossRequestOk.jsp      |  20 ++
 .../successClientSideValidationExample.jsp         |  20 ++
 .../validation/successFieldValidatorsExample.jsp   |  20 ++
 .../successNonFieldValidatorsExample.jsp           |  20 ++
 .../validation/successVisitorValidatorsExample.jsp |  22 +-
 .../validation/visitorValidatorsExample.jsp        |  22 +-
 .../src/main/webapp/WEB-INF/viewSource.jsp         |  20 ++
 .../src/main/webapp/WEB-INF/wait/complete.jsp      |  20 ++
 .../src/main/webapp/WEB-INF/wait/example1.jsp      |  20 ++
 .../src/main/webapp/WEB-INF/wait/example2.jsp      |  20 ++
 .../src/main/webapp/WEB-INF/wait/example3.jsp      |  20 ++
 .../showcase/src/main/webapp/WEB-INF/wait/wait.jsp |  20 ++
 apps/showcase/src/main/webapp/WEB-INF/web.xml      |  20 +-
 .../src/main/webapp/WEB-INF/xslt/index.jsp         |  20 ++
 .../customTheme/ftlCustomTemplate.ftl              |  20 ++
 .../customTheme/jspCustomTemplate.jsp              |  20 ++
 apps/showcase/src/main/webapp/index.html           |  20 ++
 apps/showcase/src/main/webapp/person/index.html    |  20 ++
 apps/showcase/src/main/webapp/skill/index.html     |  20 ++
 .../src/main/webapp/template/xhtml/mytemplate.jsp  |  21 +-
 apps/showcase/src/main/webapp/token/index.html     |  20 ++
 apps/showcase/src/main/webapp/wait/index.html      |  20 ++
 apps/showcase/src/main/webapp/xslt/environment.xsl |  20 ++
 .../showcase/staticcontent/StaticContentTest.java  |  18 ++
 .../filedownload/FileDownloadActionTest.java       |  18 ++
 assembly/pom.xml                                   |  20 ++
 assembly/src/main/assembly/all.xml                 |   3 -
 assembly/src/main/assembly/apps.xml                |   2 -
 assembly/src/main/assembly/docs.xml                |   3 -
 assembly/src/main/assembly/lib.xml                 |   3 -
 assembly/src/main/assembly/min-lib.xml             |   3 -
 assembly/src/main/assembly/src.xml                 |   3 -
 assembly/src/main/resources/build.xml              |  22 +-
 bom/pom.xml                                        |  20 ++
 bundles/admin/pom.xml                              |  20 ++
 .../main/resources/osgi/admin/commandResult.ftl    |  20 ++
 .../admin/src/main/resources/osgi/admin/shell.ftl  |   4 +-
 .../src/main/resources/osgi/admin/viewBundle.ftl   |  20 ++
 .../src/main/resources/osgi/admin/viewBundles.ftl  |  20 ++
 bundles/admin/src/main/resources/struts.xml        |  38 +--
 bundles/demo/pom.xml                               |  20 ++
 .../main/java/actions/osgi/HelloWorldAction.java   |  20 ++
 .../META-INF/spring/applicationContext.xml         |  20 ++
 .../src/main/resources/content/osgi/bundles.ftl    |  20 ++
 .../resources/content/osgi/hello-convention.ftl    |  20 ++
 .../demo/src/main/resources/content/osgi/hello.ftl |  20 ++
 .../demo/src/main/resources/content/osgi/hello.vm  |  18 ++
 .../demo/src/main/resources/content/osgi/home.ftl  |  20 ++
 bundles/demo/src/main/resources/struts.xml         |  20 ++
 bundles/pom.xml                                    |   2 -
 core/pom.xml                                       |   2 -
 .../main/java/com/opensymphony/xwork2/Action.java  |  29 +-
 .../com/opensymphony/xwork2/ActionChainResult.java |  30 +-
 .../com/opensymphony/xwork2/ActionContext.java     |  30 +-
 .../opensymphony/xwork2/ActionEventListener.java   |  29 +-
 .../com/opensymphony/xwork2/ActionInvocation.java  |  30 +-
 .../java/com/opensymphony/xwork2/ActionProxy.java  |  30 +-
 .../opensymphony/xwork2/ActionProxyFactory.java    |  30 +-
 .../com/opensymphony/xwork2/ActionSupport.java     |  29 +-
 .../opensymphony/xwork2/CompositeTextProvider.java |  19 +-
 .../xwork2/DefaultActionInvocation.java            |  30 +-
 .../opensymphony/xwork2/DefaultActionProxy.java    |   3 -
 .../xwork2/DefaultActionProxyFactory.java          |  30 +-
 .../opensymphony/xwork2/DefaultLocaleProvider.java |  25 +-
 .../xwork2/DefaultLocaleProviderFactory.java       |  18 ++
 .../opensymphony/xwork2/DefaultTextProvider.java   |  29 +-
 .../xwork2/DefaultUnknownHandlerManager.java       |  29 +-
 .../java/com/opensymphony/xwork2/FileManager.java  |  18 ++
 .../opensymphony/xwork2/FileManagerFactory.java    |  18 ++
 .../xwork2/InvalidMetadataException.java           |  32 +-
 .../com/opensymphony/xwork2/LocaleProvider.java    |  29 +-
 .../opensymphony/xwork2/LocaleProviderFactory.java |  29 +-
 .../opensymphony/xwork2/LocalizedTextProvider.java |   1 -
 .../java/com/opensymphony/xwork2/ModelDriven.java  |  30 +-
 .../com/opensymphony/xwork2/ObjectFactory.java     |  30 +-
 .../java/com/opensymphony/xwork2/Preparable.java   |  30 +-
 .../xwork2/ResourceBundleTextProvider.java         |  29 +-
 .../main/java/com/opensymphony/xwork2/Result.java  |  30 +-
 .../xwork2/StrutsTextProviderFactory.java          |  29 +-
 .../opensymphony/xwork2/TestNGXWorkTestCase.java   |  29 +-
 .../java/com/opensymphony/xwork2/TextProvider.java |  30 +-
 .../opensymphony/xwork2/TextProviderFactory.java   |  25 +-
 .../opensymphony/xwork2/TextProviderSupport.java   |  30 +-
 .../java/com/opensymphony/xwork2/Unchainable.java  |  30 +-
 .../com/opensymphony/xwork2/UnknownHandler.java    |  29 +-
 .../opensymphony/xwork2/UnknownHandlerManager.java |  29 +-
 .../java/com/opensymphony/xwork2/Validateable.java |  30 +-
 .../xwork2/ValidationAwareSupport.java             |  29 +-
 .../com/opensymphony/xwork2/XWorkConstants.java    |  18 ++
 .../com/opensymphony/xwork2/XWorkException.java    |  30 +-
 .../opensymphony/xwork2/XWorkJUnit4TestCase.java   |  25 +-
 .../com/opensymphony/xwork2/XWorkTestCase.java     |  31 +-
 .../xwork2/config/BeanSelectionProvider.java       |  18 ++
 .../opensymphony/xwork2/config/Configuration.java  |  29 +-
 .../xwork2/config/ConfigurationException.java      |  29 +-
 .../xwork2/config/ConfigurationManager.java        |  29 +-
 .../xwork2/config/ConfigurationProvider.java       |  29 +-
 .../xwork2/config/ConfigurationUtil.java           |  29 +-
 .../xwork2/config/ContainerProvider.java           |  29 +-
 .../xwork2/config/FileManagerFactoryProvider.java  |  18 ++
 .../xwork2/config/FileManagerProvider.java         |  18 ++
 .../xwork2/config/PackageProvider.java             |  29 +-
 .../xwork2/config/ReferenceResolverException.java  |  32 +-
 .../xwork2/config/RuntimeConfiguration.java        |  29 +-
 .../ServletContextAwareConfigurationProvider.java  |  25 +-
 .../xwork2/config/entities/ActionConfig.java       |  25 +-
 .../xwork2/config/entities/AllowedMethods.java     |  25 +-
 .../config/entities/ExceptionMappingConfig.java    |  30 +-
 .../xwork2/config/entities/InterceptorConfig.java  |  29 +-
 .../config/entities/InterceptorListHolder.java     |  29 +-
 .../xwork2/config/entities/InterceptorLocator.java |  18 ++
 .../xwork2/config/entities/InterceptorMapping.java |  30 +-
 .../config/entities/InterceptorStackConfig.java    |  29 +-
 .../xwork2/config/entities/PackageConfig.java      |  25 +-
 .../xwork2/config/entities/Parameterizable.java    |  29 +-
 .../xwork2/config/entities/ResultConfig.java       |  29 +-
 .../xwork2/config/entities/ResultTypeConfig.java   |  29 +-
 .../config/entities/UnknownHandlerConfig.java      |  29 +-
 .../xwork2/config/entities/package.html            |  20 ++
 .../xwork2/config/impl/AbstractMatcher.java        |  27 +-
 .../xwork2/config/impl/ActionConfigMatcher.java    |  27 +-
 .../xwork2/config/impl/DefaultConfiguration.java   |  29 +-
 .../config/impl/LocatableConstantFactory.java      |  19 +-
 .../xwork2/config/impl/LocatableFactory.java       |  18 ++
 .../xwork2/config/impl/MockConfiguration.java      |  29 +-
 .../xwork2/config/impl/NamespaceMatch.java         |  29 +-
 .../xwork2/config/impl/NamespaceMatcher.java       |  29 +-
 .../opensymphony/xwork2/config/impl/package.html   |  20 ++
 .../com/opensymphony/xwork2/config/package.html    |  20 ++
 .../xwork2/config/providers/CycleDetector.java     |  18 ++
 .../xwork2/config/providers/DirectedGraph.java     |  18 ++
 .../config/providers/EnvsValueSubstitutor.java     |  25 +-
 .../config/providers/InterceptorBuilder.java       |  29 +-
 .../xwork2/config/providers/ValueSubstitutor.java  |  25 +-
 .../providers/XWorkConfigurationProvider.java      |  18 ++
 .../config/providers/XmlConfigurationProvider.java |  25 +-
 .../xwork2/config/providers/XmlHelper.java         |  29 +-
 .../xwork2/config/providers/package.html           |  20 ++
 .../conversion/ConversionAnnotationProcessor.java  |  18 ++
 .../xwork2/conversion/ConversionFileProcessor.java |  18 ++
 .../conversion/ConversionPropertiesProcessor.java  |  25 +-
 .../xwork2/conversion/NullHandler.java             |  48 ++-
 .../xwork2/conversion/ObjectTypeDeterminer.java    |  29 +-
 .../xwork2/conversion/TypeConversionException.java |  29 +-
 .../xwork2/conversion/TypeConverter.java           |  48 ++-
 .../xwork2/conversion/TypeConverterCreator.java    |  18 ++
 .../xwork2/conversion/TypeConverterHolder.java     |  18 ++
 .../xwork2/conversion/annotations/Conversion.java  |  29 +-
 .../conversion/annotations/ConversionRule.java     |  29 +-
 .../conversion/annotations/ConversionType.java     |  29 +-
 .../conversion/annotations/TypeConversion.java     |  29 +-
 .../xwork2/conversion/annotations/package.html     |  20 ++
 .../xwork2/conversion/impl/ArrayConverter.java     |  18 ++
 .../conversion/impl/CollectionConverter.java       |  18 ++
 .../xwork2/conversion/impl/DateConverter.java      |  18 ++
 .../impl/DefaultConversionAnnotationProcessor.java |  18 ++
 .../impl/DefaultConversionFileProcessor.java       |  18 ++
 .../impl/DefaultConversionPropertiesProcessor.java |  25 +-
 .../impl/DefaultObjectTypeDeterminer.java          |  29 +-
 .../conversion/impl/DefaultTypeConverter.java      |  48 ++-
 .../impl/DefaultTypeConverterCreator.java          |  18 ++
 .../impl/DefaultTypeConverterHolder.java           |  18 ++
 .../conversion/impl/InstantiatingNullHandler.java  |  29 +-
 .../xwork2/conversion/impl/NumberConverter.java    |  18 ++
 .../xwork2/conversion/impl/StringConverter.java    |  18 ++
 .../conversion/impl/XWorkBasicConverter.java       |  29 +-
 .../xwork2/conversion/impl/XWorkConverter.java     |  29 +-
 .../conversion/metadata/ConversionDescription.java |  32 +-
 .../xwork2/conversion/metadata/package.html        |  20 ++
 .../opensymphony/xwork2/factory/ActionFactory.java |  18 ++
 .../xwork2/factory/ConverterFactory.java           |  18 ++
 .../xwork2/factory/DefaultActionFactory.java       |  18 ++
 .../xwork2/factory/DefaultConverterFactory.java    |  18 ++
 .../xwork2/factory/DefaultInterceptorFactory.java  |  18 ++
 .../xwork2/factory/DefaultResultFactory.java       |  18 ++
 .../factory/DefaultUnknownHandlerFactory.java      |  18 ++
 .../xwork2/factory/DefaultValidatorFactory.java    |  18 ++
 .../xwork2/factory/InterceptorFactory.java         |  18 ++
 .../opensymphony/xwork2/factory/ResultFactory.java |  18 ++
 .../xwork2/factory/UnknownHandlerFactory.java      |  18 ++
 .../xwork2/factory/ValidatorFactory.java           |  18 ++
 .../xwork2/inject/ConstructionContext.java         |   2 +-
 .../com/opensymphony/xwork2/inject/Container.java  |   2 +-
 .../xwork2/inject/ContainerBuilder.java            |   2 +-
 .../opensymphony/xwork2/inject/ContainerImpl.java  |   2 +-
 .../com/opensymphony/xwork2/inject/Context.java    |   2 +-
 .../xwork2/inject/DependencyException.java         |   2 +-
 .../xwork2/inject/ExternalContext.java             |   2 +-
 .../com/opensymphony/xwork2/inject/Factory.java    |   2 +-
 .../com/opensymphony/xwork2/inject/Inject.java     |   2 +-
 .../xwork2/inject/InternalContext.java             |   2 +-
 .../xwork2/inject/InternalFactory.java             |   2 +-
 .../java/com/opensymphony/xwork2/inject/Key.java   |   2 +-
 .../java/com/opensymphony/xwork2/inject/Scope.java |   2 +-
 .../com/opensymphony/xwork2/inject/Scoped.java     |   2 +-
 .../opensymphony/xwork2/inject/package-info.java   |   2 +-
 .../inject/util/FinalizablePhantomReference.java   |   2 +-
 .../xwork2/inject/util/FinalizableReference.java   |   2 +-
 .../inject/util/FinalizableReferenceQueue.java     |   2 +-
 .../inject/util/FinalizableSoftReference.java      |   2 +-
 .../inject/util/FinalizableWeakReference.java      |   2 +-
 .../opensymphony/xwork2/inject/util/Function.java  |   2 +-
 .../xwork2/inject/util/ReferenceCache.java         |   2 +-
 .../xwork2/inject/util/ReferenceMap.java           |   2 +-
 .../xwork2/inject/util/ReferenceType.java          |   2 +-
 .../opensymphony/xwork2/inject/util/Strings.java   |   2 +-
 .../opensymphony/xwork2/inject/util/package.html   |  20 ++
 .../xwork2/interceptor/AbstractInterceptor.java    |  29 +-
 .../xwork2/interceptor/AliasInterceptor.java       |  30 +-
 .../xwork2/interceptor/ChainingInterceptor.java    |  29 +-
 .../interceptor/ConversionErrorInterceptor.java    |  29 +-
 .../interceptor/DefaultWorkflowInterceptor.java    |  29 +-
 .../xwork2/interceptor/ExceptionHolder.java        |  29 +-
 .../interceptor/ExceptionMappingInterceptor.java   |  29 +-
 .../xwork2/interceptor/Interceptor.java            |  30 +-
 .../xwork2/interceptor/LoggingInterceptor.java     |  29 +-
 .../interceptor/MethodFilterInterceptor.java       |  31 +-
 .../interceptor/MethodFilterInterceptorUtil.java   |  29 +-
 .../xwork2/interceptor/ModelDrivenInterceptor.java |  30 +-
 .../xwork2/interceptor/NoParameters.java           |  30 +-
 .../interceptor/ParameterFilterInterceptor.java    |  29 +-
 .../xwork2/interceptor/ParameterNameAware.java     |  29 +-
 .../interceptor/ParameterRemoverInterceptor.java   |  29 +-
 .../xwork2/interceptor/ParametersInterceptor.java  |  25 +-
 .../xwork2/interceptor/PreResultListener.java      |  30 +-
 .../interceptor/PrefixMethodInvocationUtil.java    |  29 +-
 .../xwork2/interceptor/PrepareInterceptor.java     |  31 +-
 .../xwork2/interceptor/ScopedModelDriven.java      |  29 +-
 .../interceptor/ScopedModelDrivenInterceptor.java  |  29 +-
 .../interceptor/StaticParametersInterceptor.java   |  30 +-
 .../xwork2/interceptor/TimerInterceptor.java       |  29 +-
 .../xwork2/interceptor/ValidationAware.java        |  29 +-
 .../xwork2/interceptor/ValidationErrorAware.java   |  26 +-
 .../interceptor/ValidationWorkflowAware.java       |  18 ++
 .../xwork2/interceptor/WithLazyParams.java         |  18 ++
 .../xwork2/interceptor/annotations/After.java      |  29 +-
 .../xwork2/interceptor/annotations/Allowed.java    |  18 ++
 .../AnnotationParameterFilterInterceptor.java      |  19 +-
 .../annotations/AnnotationWorkflowInterceptor.java |  29 +-
 .../xwork2/interceptor/annotations/Before.java     |  29 +-
 .../interceptor/annotations/BeforeResult.java      |  29 +-
 .../interceptor/annotations/BlockByDefault.java    |  18 ++
 .../xwork2/interceptor/annotations/Blocked.java    |  18 ++
 .../interceptor/annotations/InputConfig.java       |  29 +-
 .../xwork2/interceptor/annotations/package.html    |  20 ++
 .../opensymphony/xwork2/interceptor/package.html   |  20 ++
 .../xwork2/mock/MockActionInvocation.java          |  30 +-
 .../opensymphony/xwork2/mock/MockActionProxy.java  |  30 +-
 .../opensymphony/xwork2/mock/MockContainer.java    |  18 ++
 .../opensymphony/xwork2/mock/MockInterceptor.java  |  29 +-
 .../xwork2/mock/MockObjectTypeDeterminer.java      |  29 +-
 .../com/opensymphony/xwork2/mock/MockResult.java   |  29 +-
 .../java/com/opensymphony/xwork2/mock/package.html |  20 ++
 .../xwork2/ognl/ErrorMessageBuilder.java           |  18 ++
 .../com/opensymphony/xwork2/ognl/ObjectProxy.java  |  30 +-
 .../xwork2/ognl/OgnlNullHandlerWrapper.java        |  18 ++
 .../xwork2/ognl/OgnlReflectionContextFactory.java  |  18 ++
 .../xwork2/ognl/OgnlReflectionProvider.java        |  18 ++
 .../xwork2/ognl/OgnlTypeConverterWrapper.java      |  29 +-
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java     |  29 +-
 .../opensymphony/xwork2/ognl/OgnlValueStack.java   |  29 +-
 .../xwork2/ognl/OgnlValueStackFactory.java         |  29 +-
 .../xwork2/ognl/SecurityMemberAccess.java          |  29 +-
 .../xwork2/ognl/XWorkTypeConverterWrapper.java     |  29 +-
 .../xwork2/ognl/accessor/CompoundRootAccessor.java |  29 +-
 .../accessor/HttpParametersPropertyAccessor.java   |  17 +-
 .../xwork2/ognl/accessor/ObjectAccessor.java       |  19 +-
 .../ognl/accessor/ObjectProxyPropertyAccessor.java |  30 +-
 .../ognl/accessor/ParameterPropertyAccessor.java   |  17 +-
 .../accessor/XWorkCollectionPropertyAccessor.java  |  30 +-
 .../ognl/accessor/XWorkEnumerationAccessor.java    |  29 +-
 .../accessor/XWorkIteratorPropertyAccessor.java    |  29 +-
 .../ognl/accessor/XWorkListPropertyAccessor.java   |  29 +-
 .../ognl/accessor/XWorkMapPropertyAccessor.java    |  30 +-
 .../xwork2/ognl/accessor/XWorkMethodAccessor.java  |  30 +-
 .../ognl/accessor/XWorkObjectPropertyAccessor.java |  29 +-
 .../main/java/com/opensymphony/xwork2/package.html |  20 ++
 .../xwork2/result/ParamNameAwareResult.java        |  18 ++
 .../xwork2/security/AcceptedPatternsChecker.java   |  18 ++
 .../security/DefaultAcceptedPatternsChecker.java   |  18 ++
 .../security/DefaultExcludedPatternsChecker.java   |  18 ++
 .../xwork2/security/ExcludedPatternsChecker.java   |  18 ++
 .../xwork2/spring/SpringObjectFactory.java         |  29 +-
 .../spring/SpringProxyableObjectFactory.java       |  29 +-
 .../interceptor/ActionAutowiringInterceptor.java   |  30 +-
 .../xwork2/spring/interceptor/package.html         |  20 ++
 .../com/opensymphony/xwork2/spring/package.html    |  20 ++
 .../xwork2/test/StubConfigurationProvider.java     |  18 ++
 .../xwork2/util/AbstractLocalizedTextProvider.java |  18 ++
 .../opensymphony/xwork2/util/AnnotationUtils.java  |  29 +-
 .../opensymphony/xwork2/util/ClassLoaderUtil.java  |  29 +-
 .../opensymphony/xwork2/util/ClassPathFinder.java  |  27 +-
 .../xwork2/util/ClearableValueStack.java           |  27 +-
 .../com/opensymphony/xwork2/util/CompoundRoot.java |  29 +-
 .../com/opensymphony/xwork2/util/CreateIfNull.java |  30 +-
 .../com/opensymphony/xwork2/util/DomHelper.java    |  29 +-
 .../java/com/opensymphony/xwork2/util/Element.java |  30 +-
 .../com/opensymphony/xwork2/util/Evaluated.java    |  18 ++
 .../xwork2/util/GlobalLocalizedTextProvider.java   |   3 -
 .../java/com/opensymphony/xwork2/util/Key.java     |  30 +-
 .../com/opensymphony/xwork2/util/KeyProperty.java  |  30 +-
 .../xwork2/util/MemberAccessValueStack.java        |  18 ++
 .../xwork2/util/NamedVariablePatternMatcher.java   |  29 +-
 .../opensymphony/xwork2/util/OgnlTextParser.java   |  18 ++
 .../opensymphony/xwork2/util/PatternMatcher.java   |  27 +-
 .../opensymphony/xwork2/util/PropertiesReader.java |  30 +-
 .../com/opensymphony/xwork2/util/ProxyUtil.java    |  25 +-
 .../com/opensymphony/xwork2/util/ResolverUtil.java |  26 +-
 .../xwork2/util/StrutsLocalizedTextProvider.java   |   3 -
 .../opensymphony/xwork2/util/TextParseUtil.java    |  29 +-
 .../com/opensymphony/xwork2/util/TextParser.java   |  18 ++
 .../com/opensymphony/xwork2/util/ValueStack.java   |  29 +-
 .../xwork2/util/ValueStackFactory.java             |  29 +-
 .../opensymphony/xwork2/util/WildcardHelper.java   |  27 +-
 .../com/opensymphony/xwork2/util/WildcardUtil.java |  25 +-
 .../com/opensymphony/xwork2/util/XWorkList.java    |  30 +-
 .../xwork2/util/XWorkTestCaseHelper.java           |  29 +-
 .../util/classloader/AbstractResourceStore.java    |  25 +-
 .../xwork2/util/classloader/FileResourceStore.java |  29 +-
 .../xwork2/util/classloader/JarResourceStore.java  |  30 +-
 .../util/classloader/ReloadingClassLoader.java     |  29 +-
 .../xwork2/util/classloader/ResourceStore.java     |  29 +-
 .../util/classloader/ResourceStoreClassLoader.java |  29 +-
 .../xwork2/util/finder/ClassFinder.java            |  18 ++
 .../xwork2/util/finder/ClassFinderFactory.java     |  25 +-
 .../xwork2/util/finder/ClassLoaderInterface.java   |  29 +-
 .../util/finder/ClassLoaderInterfaceDelegate.java  |  29 +-
 .../xwork2/util/finder/ResourceFinder.java         |  29 +-
 .../com/opensymphony/xwork2/util/finder/Test.java  |  29 +-
 .../opensymphony/xwork2/util/finder/UrlSet.java    |  29 +-
 .../xwork2/util/fs/DefaultFileManager.java         |  29 +-
 .../xwork2/util/fs/DefaultFileManagerFactory.java  |  18 ++
 .../opensymphony/xwork2/util/fs/FileRevision.java  |  18 ++
 .../xwork2/util/fs/JarEntryRevision.java           |  18 ++
 .../com/opensymphony/xwork2/util/fs/Revision.java  |  18 ++
 .../xwork2/util/location/Locatable.java            |  29 +-
 .../xwork2/util/location/LocatableProperties.java  |  18 ++
 .../opensymphony/xwork2/util/location/Located.java |  29 +-
 .../xwork2/util/location/Location.java             |  29 +-
 .../xwork2/util/location/LocationAttributes.java   |  29 +-
 .../xwork2/util/location/LocationImpl.java         |  29 +-
 .../xwork2/util/location/LocationUtils.java        |  29 +-
 .../opensymphony/xwork2/util/location/package.html |  24 +-
 .../opensymphony/xwork2/util/logging/Logger.java   |  29 +-
 .../xwork2/util/logging/LoggerFactory.java         |  29 +-
 .../xwork2/util/logging/LoggerUtils.java           |  29 +-
 .../xwork2/util/logging/commons/CommonsLogger.java |  29 +-
 .../util/logging/commons/CommonsLoggerFactory.java |  29 +-
 .../xwork2/util/logging/jdk/JdkLogger.java         |  29 +-
 .../xwork2/util/logging/jdk/JdkLoggerFactory.java  |  29 +-
 .../xwork2/util/logging/log4j2/Log4j2Logger.java   |  29 +-
 .../util/logging/log4j2/Log4j2LoggerFactory.java   |  29 +-
 .../xwork2/util/logging/slf4j/Slf4jLogger.java     |  29 +-
 .../util/logging/slf4j/Slf4jLoggerFactory.java     |  29 +-
 .../java/com/opensymphony/xwork2/util/package.html |  20 ++
 .../xwork2/util/profiling/ObjectProfiler.java      |  19 ++
 .../xwork2/util/profiling/ProfilingTimerBean.java  |  19 ++
 .../xwork2/util/profiling/UtilTimerStack.java      |  19 ++
 .../xwork2/util/profiling/package.html             |  20 ++
 .../util/reflection/ReflectionContextFactory.java  |  18 ++
 .../util/reflection/ReflectionContextState.java    |  30 +-
 .../util/reflection/ReflectionException.java       |  18 ++
 .../reflection/ReflectionExceptionHandler.java     |  18 ++
 .../xwork2/util/reflection/ReflectionProvider.java |  18 ++
 .../util/reflection/ReflectionProviderFactory.java |  22 ++
 .../xwork2/validator/ActionValidatorManager.java   |  29 +-
 .../AnnotationActionValidatorManager.java          |  30 +-
 .../AnnotationValidationConfigurationBuilder.java  |  29 +-
 .../validator/DefaultActionValidatorManager.java   |  30 +-
 .../xwork2/validator/DefaultValidatorFactory.java  |  30 +-
 .../validator/DefaultValidatorFileParser.java      |  30 +-
 .../validator/DelegatingValidatorContext.java      |  30 +-
 .../xwork2/validator/FieldValidator.java           |  29 +-
 .../validator/ShortCircuitableValidator.java       |  30 +-
 .../xwork2/validator/ValidationException.java      |  30 +-
 .../xwork2/validator/ValidationInterceptor.java    |  29 +-
 .../opensymphony/xwork2/validator/Validator.java   |  30 +-
 .../xwork2/validator/ValidatorConfig.java          |  29 +-
 .../xwork2/validator/ValidatorContext.java         |  30 +-
 .../xwork2/validator/ValidatorFactory.java         |  18 ++
 .../xwork2/validator/ValidatorFileParser.java      |  18 ++
 .../ConditionalVisitorFieldValidator.java          |  18 ++
 .../annotations/ConversionErrorFieldValidator.java |  30 +-
 .../validator/annotations/CreditCardValidator.java |  30 +-
 .../validator/annotations/CustomValidator.java     |  30 +-
 .../annotations/DateRangeFieldValidator.java       |  30 +-
 .../annotations/DoubleRangeFieldValidator.java     |  30 +-
 .../validator/annotations/EmailValidator.java      |  30 +-
 .../validator/annotations/ExpressionValidator.java |  30 +-
 .../annotations/FieldExpressionValidator.java      |  30 +-
 .../annotations/IntRangeFieldValidator.java        |  30 +-
 .../annotations/LongRangeFieldValidator.java       |  30 +-
 .../validator/annotations/RegexFieldValidator.java |  30 +-
 .../annotations/RequiredFieldValidator.java        |  30 +-
 .../annotations/RequiredStringValidator.java       |  30 +-
 .../annotations/ShortRangeFieldValidator.java      |  30 +-
 .../annotations/StringLengthFieldValidator.java    |  30 +-
 .../xwork2/validator/annotations/UrlValidator.java |  29 +-
 .../xwork2/validator/annotations/Validation.java   |  31 +-
 .../validator/annotations/ValidationParameter.java |  30 +-
 .../xwork2/validator/annotations/Validations.java  |  30 +-
 .../validator/annotations/ValidatorType.java       |  30 +-
 .../annotations/VisitorFieldValidator.java         |  30 +-
 .../xwork2/validator/annotations/package.html      |  20 ++
 .../com/opensymphony/xwork2/validator/package.html |  20 ++
 .../ConditionalVisitorFieldValidator.java          |  18 ++
 .../validators/ConversionErrorFieldValidator.java  |  30 +-
 .../validator/validators/CreditCardValidator.java  |  30 +-
 .../validators/DateRangeFieldValidator.java        |  29 +-
 .../validators/DoubleRangeFieldValidator.java      |  30 +-
 .../validator/validators/EmailValidator.java       |  30 +-
 .../validator/validators/ExpressionValidator.java  |  29 +-
 .../validators/FieldExpressionValidator.java       |  30 +-
 .../validators/FieldValidatorSupport.java          |  29 +-
 .../validators/IntRangeFieldValidator.java         |  29 +-
 .../validators/LongRangeFieldValidator.java        |  29 +-
 .../validators/RangeValidatorSupport.java          |  29 +-
 .../validator/validators/RegexFieldValidator.java  |  34 +-
 ...pulateConversionErrorFieldValidatorSupport.java |  29 +-
 .../validators/RequiredFieldValidator.java         |  30 +-
 .../validators/RequiredStringValidator.java        |  29 +-
 .../validators/ShortRangeFieldValidator.java       |  29 +-
 .../validators/StringLengthFieldValidator.java     |  29 +-
 .../xwork2/validator/validators/URLValidator.java  |  29 +-
 .../validator/validators/ValidatorSupport.java     |  30 +-
 .../validators/VisitorFieldValidator.java          |  30 +-
 .../xwork2/validator/validators/package.html       |  20 ++
 .../main/java/org/apache/struts2/RequestUtils.java |   4 -
 .../org/apache/struts2/ServletActionContext.java   |   4 -
 .../java/org/apache/struts2/StrutsConstants.java   |   3 -
 .../java/org/apache/struts2/StrutsException.java   |   4 -
 .../java/org/apache/struts2/StrutsStatics.java     |   4 -
 .../apache/struts2/components/ActionComponent.java |   3 -
 .../org/apache/struts2/components/ActionError.java |   3 -
 .../apache/struts2/components/ActionMessage.java   |   3 -
 .../java/org/apache/struts2/components/Anchor.java |   3 -
 .../apache/struts2/components/AppendIterator.java  |   3 -
 .../java/org/apache/struts2/components/Bean.java   |   3 -
 .../org/apache/struts2/components/Checkbox.java    |   3 -
 .../apache/struts2/components/CheckboxList.java    |   4 -
 .../apache/struts2/components/ClosingUIBean.java   |   3 -
 .../org/apache/struts2/components/ComboBox.java    |   3 -
 .../org/apache/struts2/components/Component.java   |   3 -
 .../struts2/components/ComponentUrlProvider.java   |   2 -
 .../org/apache/struts2/components/ContextBean.java |   3 -
 .../java/org/apache/struts2/components/Date.java   |   3 -
 .../apache/struts2/components/DateTextField.java   |  18 ++
 .../java/org/apache/struts2/components/Debug.java  |   3 -
 .../struts2/components/DoubleListUIBean.java       |   3 -
 .../apache/struts2/components/DoubleSelect.java    |   3 -
 .../java/org/apache/struts2/components/Else.java   |   3 -
 .../java/org/apache/struts2/components/ElseIf.java |   3 -
 .../struts2/components/ExtraParameterProvider.java |   2 -
 .../org/apache/struts2/components/FieldError.java  |   3 -
 .../java/org/apache/struts2/components/File.java   |   3 -
 .../java/org/apache/struts2/components/Form.java   |   3 -
 .../org/apache/struts2/components/FormButton.java  |   3 -
 .../apache/struts2/components/GenericUIBean.java   |   3 -
 .../java/org/apache/struts2/components/Head.java   |   3 -
 .../java/org/apache/struts2/components/Hidden.java |   3 -
 .../java/org/apache/struts2/components/I18n.java   |   3 -
 .../java/org/apache/struts2/components/If.java     |   3 -
 .../org/apache/struts2/components/Include.java     |   3 -
 .../struts2/components/InputTransferSelect.java    |   3 -
 .../struts2/components/IteratorComponent.java      |   3 -
 .../java/org/apache/struts2/components/Label.java  |   3 -
 .../org/apache/struts2/components/ListUIBean.java  |   3 -
 .../apache/struts2/components/MergeIterator.java   |   3 -
 .../org/apache/struts2/components/OptGroup.java    |   3 -
 .../struts2/components/OptionTransferSelect.java   |   3 -
 .../java/org/apache/struts2/components/Param.java  |   3 -
 .../org/apache/struts2/components/Password.java    |   3 -
 .../org/apache/struts2/components/Property.java    |   3 -
 .../java/org/apache/struts2/components/Push.java   |   3 -
 .../java/org/apache/struts2/components/Radio.java  |   3 -
 .../java/org/apache/struts2/components/Reset.java  |   3 -
 .../java/org/apache/struts2/components/Select.java |   3 -
 .../struts2/components/ServletUrlRenderer.java     |   3 -
 .../java/org/apache/struts2/components/Set.java    |   3 -
 .../java/org/apache/struts2/components/Submit.java |   3 -
 .../java/org/apache/struts2/components/Text.java   |   3 -
 .../org/apache/struts2/components/TextArea.java    |   3 -
 .../org/apache/struts2/components/TextField.java   |   3 -
 .../java/org/apache/struts2/components/Token.java  |   3 -
 .../java/org/apache/struts2/components/UIBean.java |   3 -
 .../java/org/apache/struts2/components/URL.java    |   3 -
 .../apache/struts2/components/UpDownSelect.java    |   3 -
 .../org/apache/struts2/components/UrlProvider.java |   2 -
 .../org/apache/struts2/components/UrlRenderer.java |   3 -
 .../components/template/BaseTemplateEngine.java    |   3 -
 .../template/FreemarkerTemplateEngine.java         |   3 -
 .../components/template/JspTemplateEngine.java     |   3 -
 .../struts2/components/template/Template.java      |   3 -
 .../components/template/TemplateEngine.java        |   3 -
 .../components/template/TemplateEngineManager.java |   3 -
 .../template/TemplateRenderingContext.java         |   3 -
 .../template/VelocityTemplateEngine.java           |   3 -
 .../config/AbstractBeanSelectionProvider.java      |  18 ++
 .../config/DefaultBeanSelectionProvider.java       |   3 -
 .../struts2/config/DefaultPropertiesProvider.java  |   3 -
 .../org/apache/struts2/config/DefaultSettings.java |   3 -
 .../apache/struts2/config/DelegatingSettings.java  |   4 -
 .../java/org/apache/struts2/config/NullResult.java |   5 +-
 .../config/PropertiesConfigurationProvider.java    |   3 -
 .../apache/struts2/config/PropertiesSettings.java  |   4 -
 .../java/org/apache/struts2/config/Settings.java   |   3 -
 .../config/StrutsXmlConfigurationProvider.java     |   3 -
 .../java/org/apache/struts2/config/package.html    |   2 -
 .../struts2/conversion/UploadedFileConverter.java  |   1 -
 .../apache/struts2/dispatcher/ApplicationMap.java  |   4 -
 .../apache/struts2/dispatcher/ContainerHolder.java |  18 ++
 .../struts2/dispatcher/DefaultActionSupport.java   |   4 -
 .../dispatcher/DefaultDispatcherErrorHandler.java  |  18 ++
 .../dispatcher/DefaultStaticContentLoader.java     |   2 -
 .../org/apache/struts2/dispatcher/Dispatcher.java  |   3 -
 .../struts2/dispatcher/DispatcherErrorHandler.java |  18 ++
 .../struts2/dispatcher/DispatcherListener.java     |   3 -
 .../struts2/dispatcher/ExecuteOperations.java      |   2 -
 .../org/apache/struts2/dispatcher/HostConfig.java  |   2 -
 .../apache/struts2/dispatcher/HttpParameters.java  |   1 -
 .../apache/struts2/dispatcher/InitOperations.java  |   2 -
 .../struts2/dispatcher/LocalizedMessage.java       |   3 -
 .../apache/struts2/dispatcher/MockDispatcher.java  |  18 ++
 .../org/apache/struts2/dispatcher/Parameter.java   |  18 ++
 .../struts2/dispatcher/PrepareOperations.java      |   2 -
 .../org/apache/struts2/dispatcher/RequestMap.java  |   4 -
 .../org/apache/struts2/dispatcher/SessionMap.java  |   4 -
 .../struts2/dispatcher/StaticContentLoader.java    |   2 -
 .../struts2/dispatcher/StrutsRequestWrapper.java   |   3 -
 .../dispatcher/filter/FilterHostConfig.java        |   2 -
 .../dispatcher/filter/StrutsExecuteFilter.java     |   2 -
 .../filter/StrutsPrepareAndExecuteFilter.java      |   2 -
 .../dispatcher/filter/StrutsPrepareFilter.java     |   2 -
 .../dispatcher/listener/ListenerHostConfig.java    |   2 -
 .../dispatcher/listener/StrutsListener.java        |   2 -
 .../struts2/dispatcher/mapper/ActionMapper.java    |   3 -
 .../struts2/dispatcher/mapper/ActionMapping.java   |   3 -
 .../dispatcher/mapper/CompositeActionMapper.java   |   3 -
 .../dispatcher/mapper/DefaultActionMapper.java     |   3 -
 .../struts2/dispatcher/mapper/ParameterAction.java |   3 -
 .../dispatcher/mapper/PrefixBasedActionMapper.java |  18 ++
 .../dispatcher/mapper/Restful2ActionMapper.java    |   3 -
 .../dispatcher/mapper/RestfulActionMapper.java     |   3 -
 .../multipart/AbstractMultiPartRequest.java        |  19 +-
 .../multipart/JakartaMultiPartRequest.java         |   3 -
 .../multipart/JakartaStreamMultiPartRequest.java   |  18 ++
 .../dispatcher/multipart/MultiPartRequest.java     |   4 -
 .../multipart/MultiPartRequestWrapper.java         |   4 -
 .../dispatcher/multipart/StrutsUploadedFile.java   |   1 -
 .../struts2/dispatcher/multipart/UploadedFile.java |   1 -
 .../struts2/dispatcher/multipart/package.html      |   2 -
 .../dispatcher/servlet/ServletHostConfig.java      |   2 -
 .../struts2/dispatcher/servlet/StrutsServlet.java  |   2 -
 .../factory/PrefixBasedActionProxyFactory.java     |  18 ++
 .../apache/struts2/factory/StrutsActionProxy.java  |   5 -
 .../struts2/factory/StrutsActionProxyFactory.java  |   5 -
 .../struts2/factory/StrutsResultFactory.java       |  18 ++
 .../ActionMappingParametersInteceptor.java         |   3 -
 .../struts2/interceptor/ApplicationAware.java      |   4 -
 .../struts2/interceptor/BackgroundProcess.java     |   3 -
 .../struts2/interceptor/CheckboxInterceptor.java   |   3 -
 .../interceptor/ClearSessionInterceptor.java       |   3 -
 .../struts2/interceptor/CookieInterceptor.java     |   3 -
 .../apache/struts2/interceptor/CookieProvider.java |   3 -
 .../interceptor/CookieProviderInterceptor.java     |   3 -
 .../apache/struts2/interceptor/CookiesAware.java   |   3 -
 .../interceptor/CreateSessionInterceptor.java      |   3 -
 .../interceptor/DateTextFieldInterceptor.java      |  18 ++
 .../interceptor/ExecuteAndWaitInterceptor.java     |   4 -
 .../struts2/interceptor/FileUploadInterceptor.java |   3 -
 .../struts2/interceptor/HttpParametersAware.java   |   4 -
 .../struts2/interceptor/I18nInterceptor.java       |   2 -
 .../interceptor/MessageStoreInterceptor.java       |   3 -
 .../interceptor/MessageStorePreResultListener.java |   1 -
 .../interceptor/MultiselectInterceptor.java        |   2 -
 .../apache/struts2/interceptor/NoParameters.java   |   4 -
 .../apache/struts2/interceptor/ParameterAware.java |   3 -
 .../apache/struts2/interceptor/PrincipalAware.java |   3 -
 .../apache/struts2/interceptor/PrincipalProxy.java |   3 -
 .../ProfilingActivationInterceptor.java            |   3 -
 .../apache/struts2/interceptor/RequestAware.java   |   3 -
 .../struts2/interceptor/RolesInterceptor.java      |   3 -
 .../struts2/interceptor/ScopeInterceptor.java      |   3 -
 .../interceptor/ServletConfigInterceptor.java      |   4 -
 .../struts2/interceptor/ServletRequestAware.java   |   4 -
 .../struts2/interceptor/ServletResponseAware.java  |   4 -
 .../apache/struts2/interceptor/SessionAware.java   |   4 -
 .../StrutsConversionErrorInterceptor.java          |   4 -
 .../struts2/interceptor/TokenInterceptor.java      |   3 -
 .../interceptor/TokenSessionStoreInterceptor.java  |   4 -
 .../debugging/DebuggingInterceptor.java            |   3 -
 .../interceptor/debugging/ObjectToHTMLWriter.java  |   3 -
 .../interceptor/debugging/PrettyPrintWriter.java   |   3 -
 .../interceptor/servlet/ServletPrincipalProxy.java |   3 -
 .../AnnotationValidationInterceptor.java           |   3 -
 .../interceptor/validation/SkipValidation.java     |   3 -
 .../apache/struts2/result/HttpHeaderResult.java    |   4 -
 .../org/apache/struts2/result/PlainTextResult.java |   3 -
 .../org/apache/struts2/result/PostbackResult.java  |   2 -
 .../org/apache/struts2/result/Redirectable.java    |  18 ++
 .../result/ServletActionRedirectResult.java        |   3 -
 .../struts2/result/ServletDispatcherResult.java    |   4 -
 .../struts2/result/ServletRedirectResult.java      |   3 -
 .../org/apache/struts2/result/StreamResult.java    |   3 -
 .../apache/struts2/result/StrutsResultSupport.java |   4 -
 .../org/apache/struts2/result/VelocityResult.java  |   4 -
 .../apache/struts2/util/AppendIteratorFilter.java  |   4 -
 .../java/org/apache/struts2/util/AttributeMap.java |   4 -
 .../org/apache/struts2/util/ComponentUtils.java    |  18 ++
 .../java/org/apache/struts2/util/ContainUtil.java  |   4 -
 .../apache/struts2/util/ContentTypeMatcher.java    |  18 ++
 .../main/java/org/apache/struts2/util/Counter.java |   4 -
 .../org/apache/struts2/util/DateFormatter.java     |   5 +-
 .../struts2/util/DefaultContentTypeMatcher.java    |  18 ++
 .../struts2/util/FastByteArrayOutputStream.java    |   4 -
 .../struts2/util/InvocationSessionStore.java       |   4 -
 .../apache/struts2/util/IteratorFilterSupport.java |   4 -
 .../org/apache/struts2/util/IteratorGenerator.java |   4 -
 .../java/org/apache/struts2/util/ListEntry.java    |   3 -
 .../java/org/apache/struts2/util/MakeIterator.java |   4 -
 .../apache/struts2/util/MergeIteratorFilter.java   |   4 -
 .../struts2/util/ObjectFactoryDestroyable.java     |   3 -
 .../java/org/apache/struts2/util/PrefixTrie.java   |   3 -
 .../apache/struts2/util/RegexPatternMatcher.java   |   2 -
 .../util/RegexPatternMatcherExpression.java        |   2 -
 .../apache/struts2/util/ServletContextAware.java   |   4 -
 .../apache/struts2/util/SortIteratorFilter.java    |   4 -
 .../apache/struts2/util/StrutsTestCaseHelper.java  |   3 -
 .../apache/struts2/util/StrutsTypeConverter.java   |   3 -
 .../java/org/apache/struts2/util/StrutsUtil.java   |   3 -
 .../apache/struts2/util/SubsetIteratorFilter.java  |   5 -
 .../java/org/apache/struts2/util/TabbedPane.java   |   5 +-
 .../apache/struts2/util/TextProviderHelper.java    |   3 -
 .../main/java/org/apache/struts2/util/Timer.java   |   5 +-
 .../java/org/apache/struts2/util/TokenHelper.java  |   3 -
 .../main/java/org/apache/struts2/util/URLBean.java |   5 +-
 .../org/apache/struts2/util/URLDecoderUtil.java    |  18 ++
 .../apache/struts2/util/VelocityStrutsUtil.java    |   4 -
 .../apache/struts2/util/fs/JBossFileManager.java   |  18 ++
 .../org/apache/struts2/util/tomcat/buf/Ascii.java  |  26 +-
 .../struts2/util/tomcat/buf/B2CConverter.java      |  26 +-
 .../apache/struts2/util/tomcat/buf/ByteChunk.java  |  26 +-
 .../apache/struts2/util/tomcat/buf/CharChunk.java  |  26 +-
 .../apache/struts2/util/tomcat/buf/HexUtils.java   |  26 +-
 .../struts2/util/tomcat/buf/MessageBytes.java      |  26 +-
 .../struts2/util/tomcat/buf/StringCache.java       |  26 +-
 .../apache/struts2/util/tomcat/buf/UDecoder.java   |  26 +-
 .../struts2/util/tomcat/buf/Utf8Decoder.java       |  26 +-
 .../apache/struts2/views/DefaultTagLibrary.java    |   3 -
 .../apache/struts2/views/JspSupportServlet.java    |   3 -
 .../struts2/views/TagLibraryDirectiveProvider.java |   3 -
 .../struts2/views/TagLibraryModelProvider.java     |   3 -
 .../struts2/views/annotations/StrutsTag.java       |   3 -
 .../views/annotations/StrutsTagAttribute.java      |   3 -
 .../annotations/StrutsTagSkipInheritance.java      |   7 +-
 .../views/freemarker/FreemarkerManager.java        |   4 -
 .../struts2/views/freemarker/FreemarkerResult.java |   1 -
 .../freemarker/FreemarkerThemeTemplateLoader.java  |  18 ++
 .../struts2/views/freemarker/ScopesHashModel.java  |   4 -
 .../views/freemarker/StrutsBeanWrapper.java        |   3 -
 .../freemarker/StrutsClassTemplateLoader.java      |   3 -
 .../views/freemarker/tags/ActionErrorModel.java    |   3 -
 .../views/freemarker/tags/ActionMessageModel.java  |   3 -
 .../struts2/views/freemarker/tags/ActionModel.java |   3 -
 .../struts2/views/freemarker/tags/AnchorModel.java |   3 -
 .../struts2/views/freemarker/tags/BeanModel.java   |   3 -
 .../views/freemarker/tags/CallbackWriter.java      |   3 -
 .../views/freemarker/tags/CheckboxListModel.java   |   3 -
 .../views/freemarker/tags/CheckboxModel.java       |   3 -
 .../views/freemarker/tags/ComboBoxModel.java       |   3 -
 .../views/freemarker/tags/ComponentModel.java      |   3 -
 .../struts2/views/freemarker/tags/DateModel.java   |   3 -
 .../views/freemarker/tags/DoubleSelectModel.java   |   3 -
 .../struts2/views/freemarker/tags/ElseIfModel.java |   3 -
 .../struts2/views/freemarker/tags/ElseModel.java   |   3 -
 .../views/freemarker/tags/FieldErrorModel.java     |   3 -
 .../struts2/views/freemarker/tags/FileModel.java   |   3 -
 .../struts2/views/freemarker/tags/FormModel.java   |   3 -
 .../struts2/views/freemarker/tags/HeadModel.java   |   3 -
 .../struts2/views/freemarker/tags/HiddenModel.java |   3 -
 .../struts2/views/freemarker/tags/I18nModel.java   |   3 -
 .../struts2/views/freemarker/tags/IfModel.java     |   3 -
 .../views/freemarker/tags/IncludeModel.java        |   3 -
 .../freemarker/tags/InputTransferSelectModel.java  |   3 -
 .../views/freemarker/tags/IteratorModel.java       |   3 -
 .../struts2/views/freemarker/tags/LabelModel.java  |   3 -
 .../views/freemarker/tags/OptGroupModel.java       |   3 -
 .../freemarker/tags/OptionTransferSelectModel.java |   3 -
 .../struts2/views/freemarker/tags/ParamModel.java  |   3 -
 .../views/freemarker/tags/PasswordModel.java       |   3 -
 .../views/freemarker/tags/PropertyModel.java       |   3 -
 .../struts2/views/freemarker/tags/PushModel.java   |   3 -
 .../struts2/views/freemarker/tags/RadioModel.java  |   3 -
 .../struts2/views/freemarker/tags/ResetModel.java  |   3 -
 .../struts2/views/freemarker/tags/SelectModel.java |   3 -
 .../struts2/views/freemarker/tags/SetModel.java    |   3 -
 .../views/freemarker/tags/StrutsModels.java        |   3 -
 .../struts2/views/freemarker/tags/SubmitModel.java |   3 -
 .../struts2/views/freemarker/tags/TagModel.java    |   3 -
 .../views/freemarker/tags/TextAreaModel.java       |   3 -
 .../views/freemarker/tags/TextFieldModel.java      |   3 -
 .../struts2/views/freemarker/tags/TextModel.java   |   3 -
 .../struts2/views/freemarker/tags/TokenModel.java  |   3 -
 .../struts2/views/freemarker/tags/URLModel.java    |   3 -
 .../views/freemarker/tags/UpDownSelectModel.java   |   3 -
 .../org/apache/struts2/views/jsp/ActionTag.java    |   3 -
 .../java/org/apache/struts2/views/jsp/BeanTag.java |   4 -
 .../struts2/views/jsp/ComponentTagSupport.java     |   3 -
 .../apache/struts2/views/jsp/ContextBeanTag.java   |   3 -
 .../java/org/apache/struts2/views/jsp/DateTag.java |   3 -
 .../org/apache/struts2/views/jsp/ElseIfTag.java    |   3 -
 .../java/org/apache/struts2/views/jsp/ElseTag.java |   4 -
 .../java/org/apache/struts2/views/jsp/I18nTag.java |   4 -
 .../java/org/apache/struts2/views/jsp/IfTag.java   |   4 -
 .../org/apache/struts2/views/jsp/IncludeTag.java   |   4 -
 .../apache/struts2/views/jsp/IteratorStatus.java   |   4 -
 .../org/apache/struts2/views/jsp/IteratorTag.java  |   3 -
 .../org/apache/struts2/views/jsp/NumberTag.java    |   5 +-
 .../org/apache/struts2/views/jsp/ParamTag.java     |   3 -
 .../org/apache/struts2/views/jsp/PropertyTag.java  |   4 -
 .../java/org/apache/struts2/views/jsp/PushTag.java |   4 -
 .../java/org/apache/struts2/views/jsp/SetTag.java  |   4 -
 .../struts2/views/jsp/StrutsBodyTagSupport.java    |   4 -
 .../org/apache/struts2/views/jsp/TagUtils.java     |   6 -
 .../java/org/apache/struts2/views/jsp/TextTag.java |   4 -
 .../java/org/apache/struts2/views/jsp/URLTag.java  |   4 -
 .../views/jsp/iterator/AppendIteratorTag.java      |   4 -
 .../views/jsp/iterator/IteratorGeneratorTag.java   |   4 -
 .../views/jsp/iterator/MergeIteratorTag.java       |   4 -
 .../views/jsp/iterator/SortIteratorTag.java        |   4 -
 .../views/jsp/iterator/SubsetIteratorTag.java      |   4 -
 .../java/org/apache/struts2/views/jsp/package.html |   2 -
 .../struts2/views/jsp/ui/AbstractClosingTag.java   |   5 -
 .../views/jsp/ui/AbstractDoubleListTag.java        |   6 -
 .../struts2/views/jsp/ui/AbstractListTag.java      |   5 -
 .../views/jsp/ui/AbstractRequiredListTag.java      |   6 -
 .../apache/struts2/views/jsp/ui/AbstractUITag.java |   4 -
 .../views/jsp/ui/AbstractUITagBeanInfo.java        |   5 +-
 .../struts2/views/jsp/ui/ActionErrorTag.java       |   3 -
 .../struts2/views/jsp/ui/ActionMessageTag.java     |   3 -
 .../org/apache/struts2/views/jsp/ui/AnchorTag.java |   3 -
 .../struts2/views/jsp/ui/CheckboxListTag.java      |   4 -
 .../apache/struts2/views/jsp/ui/CheckboxTag.java   |   4 -
 .../apache/struts2/views/jsp/ui/ComboBoxTag.java   |   3 -
 .../apache/struts2/views/jsp/ui/ComponentTag.java  |   3 -
 .../struts2/views/jsp/ui/DateTextFieldTag.java     |  18 ++
 .../org/apache/struts2/views/jsp/ui/DebugTag.java  |   3 -
 .../struts2/views/jsp/ui/DoubleSelectTag.java      |   3 -
 .../apache/struts2/views/jsp/ui/FieldErrorTag.java |   3 -
 .../org/apache/struts2/views/jsp/ui/FileTag.java   |   4 -
 .../org/apache/struts2/views/jsp/ui/FormTag.java   |   4 -
 .../org/apache/struts2/views/jsp/ui/HeadTag.java   |   3 -
 .../org/apache/struts2/views/jsp/ui/HiddenTag.java |   4 -
 .../views/jsp/ui/InputTransferSelectTag.java       |   3 -
 .../org/apache/struts2/views/jsp/ui/LabelTag.java  |   4 -
 .../org/apache/struts2/views/jsp/ui/OgnlTool.java  |   8 +-
 .../apache/struts2/views/jsp/ui/OptGroupTag.java   |   6 -
 .../views/jsp/ui/OptionTransferSelectTag.java      |   3 -
 .../apache/struts2/views/jsp/ui/PasswordTag.java   |   4 -
 .../org/apache/struts2/views/jsp/ui/RadioTag.java  |   4 -
 .../org/apache/struts2/views/jsp/ui/ResetTag.java  |   3 -
 .../org/apache/struts2/views/jsp/ui/SelectTag.java |   4 -
 .../org/apache/struts2/views/jsp/ui/SubmitTag.java |   3 -
 .../apache/struts2/views/jsp/ui/TextFieldTag.java  |   3 -
 .../apache/struts2/views/jsp/ui/TextareaTag.java   |   4 -
 .../org/apache/struts2/views/jsp/ui/TokenTag.java  |   4 -
 .../struts2/views/jsp/ui/UpDownSelectTag.java      |   3 -
 .../org/apache/struts2/views/util/ContextUtil.java |   3 -
 .../struts2/views/util/DefaultUrlHelper.java       |   3 -
 .../apache/struts2/views/util/ResourceUtil.java    |   3 -
 .../org/apache/struts2/views/util/UrlHelper.java   |  18 ++
 .../org/apache/struts2/views/util/package.html     |   2 -
 .../views/velocity/StrutsResourceLoader.java       |   5 +-
 .../views/velocity/StrutsVelocityContext.java      |   6 -
 .../struts2/views/velocity/VelocityManager.java    |   4 -
 .../velocity/components/AbstractDirective.java     |   3 -
 .../views/velocity/components/ActionDirective.java |   3 -
 .../velocity/components/ActionErrorDirective.java  |   3 -
 .../components/ActionMessageDirective.java         |   3 -
 .../views/velocity/components/AnchorDirective.java |   3 -
 .../views/velocity/components/BeanDirective.java   |   3 -
 .../velocity/components/CheckBoxDirective.java     |   3 -
 .../velocity/components/CheckBoxListDirective.java |   3 -
 .../velocity/components/ComboBoxDirective.java     |   3 -
 .../velocity/components/ComponentDirective.java    |   3 -
 .../views/velocity/components/DateDirective.java   |   3 -
 .../velocity/components/DoubleSelectDirective.java |   3 -
 .../velocity/components/FieldErrorDirective.java   |   3 -
 .../views/velocity/components/FileDirective.java   |   3 -
 .../views/velocity/components/FormDirective.java   |   3 -
 .../views/velocity/components/HeadDirective.java   |   3 -
 .../views/velocity/components/HiddenDirective.java |   3 -
 .../views/velocity/components/I18nDirective.java   |   3 -
 .../velocity/components/IncludeDirective.java      |   3 -
 .../components/InputTransferSelectDirective.java   |   3 -
 .../views/velocity/components/LabelDirective.java  |   3 -
 .../velocity/components/OptGroupDirective.java     |   4 -
 .../components/OptionTransferSelectDirective.java  |   3 -
 .../views/velocity/components/ParamDirective.java  |   3 -
 .../velocity/components/PasswordDirective.java     |   3 -
 .../velocity/components/PropertyDirective.java     |   3 -
 .../views/velocity/components/PushDirective.java   |   3 -
 .../views/velocity/components/RadioDirective.java  |   3 -
 .../views/velocity/components/ResetDirective.java  |   3 -
 .../views/velocity/components/SelectDirective.java |   3 -
 .../views/velocity/components/SetDirective.java    |   3 -
 .../views/velocity/components/SubmitDirective.java |   3 -
 .../velocity/components/TextAreaDirective.java     |   3 -
 .../views/velocity/components/TextDirective.java   |   3 -
 .../velocity/components/TextFieldDirective.java    |   3 -
 .../views/velocity/components/TokenDirective.java  |   3 -
 .../views/velocity/components/URLDirective.java    |   3 -
 .../velocity/components/UpDownSelectDirective.java |   3 -
 .../org/apache/struts2/views/velocity/package.html |   2 -
 .../struts2/views/xslt/AbstractAdapterElement.java |   3 -
 .../struts2/views/xslt/AbstractAdapterNode.java    |   3 -
 .../apache/struts2/views/xslt/AdapterFactory.java  |   3 -
 .../org/apache/struts2/views/xslt/AdapterNode.java |   3 -
 .../apache/struts2/views/xslt/ArrayAdapter.java    |   6 -
 .../org/apache/struts2/views/xslt/BeanAdapter.java |   4 -
 .../struts2/views/xslt/CollectionAdapter.java      |   6 -
 .../org/apache/struts2/views/xslt/MapAdapter.java  |   3 -
 .../struts2/views/xslt/ProxyAttrAdapter.java       |   3 -
 .../struts2/views/xslt/ProxyElementAdapter.java    |   3 -
 .../struts2/views/xslt/ProxyNamedNodeMap.java      |   3 -
 .../struts2/views/xslt/ProxyNodeAdapter.java       |   3 -
 .../struts2/views/xslt/ProxyTextNodeAdapter.java   |   3 -
 .../struts2/views/xslt/ServletURIResolver.java     |   4 -
 .../struts2/views/xslt/SimpleAdapterDocument.java  |   3 -
 .../apache/struts2/views/xslt/SimpleNodeList.java  |   3 -
 .../apache/struts2/views/xslt/SimpleTextNode.java  |   7 -
 .../apache/struts2/views/xslt/StringAdapter.java   |   3 -
 .../org/apache/struts2/views/xslt/XSLTResult.java  |   1 -
 .../org/apache/struts2/views/xslt/package.html     |   2 -
 .../xwork2/validator/validators/default.xml        |  20 ++
 .../opensymphony/xwork2/xwork-messages.properties  |  19 +-
 core/src/main/resources/jshint.conf.js             |  18 ++
 .../org/apache/struts2/default.properties          |   2 -
 .../org/apache/struts2/dispatcher/error.ftl        |   2 -
 .../struts2/interceptor/debugging/browser.ftl      |   2 -
 .../struts2/interceptor/debugging/console.ftl      |   2 -
 .../org/apache/struts2/interceptor/package.html    |   2 -
 .../org/apache/struts2/interceptor/wait.ftl        |   2 -
 .../main/resources/org/apache/struts2/package.html |   2 -
 .../org/apache/struts2/struts-messages.properties  |   2 -
 .../apache/struts2/struts-messages_da.properties   |   2 -
 .../apache/struts2/struts-messages_de.properties   |   2 -
 .../apache/struts2/struts-messages_en.properties   |   2 -
 .../apache/struts2/struts-messages_pl.properties   |   2 -
 .../apache/struts2/struts-messages_pt.properties   |   2 -
 .../resources/org/apache/struts2/util/package.html |   2 -
 .../apache/struts2/views/freemarker/package.html   |   2 -
 .../apache/struts2/views/jsp/iterator/package.html |   2 -
 .../org/apache/struts2/views/jsp/ui/package.html   |   2 -
 .../apache/struts2/views/jsp/ui/table/package.html |   2 -
 core/src/main/resources/struts-2.0.dtd             |   2 -
 core/src/main/resources/struts-2.1.7.dtd           |   2 -
 core/src/main/resources/struts-2.1.dtd             |   2 -
 core/src/main/resources/struts-2.3.dtd             |   2 -
 core/src/main/resources/struts-2.5.dtd             |   2 -
 .../resources/struts-default-conversion.properties |  18 ++
 core/src/main/resources/struts-default.xml         |   2 -
 .../main/resources/template/css_xhtml/checkbox.ftl |   2 -
 .../resources/template/css_xhtml/control-close.ftl |   2 -
 .../main/resources/template/css_xhtml/control.ftl  |   2 -
 .../resources/template/css_xhtml/controlfooter.ftl |   2 -
 .../template/css_xhtml/controlheader-core.ftl      |   2 -
 .../resources/template/css_xhtml/controlheader.ftl |   2 -
 .../resources/template/css_xhtml/form-validate.ftl |   2 -
 .../src/main/resources/template/css_xhtml/head.ftl |   2 -
 .../main/resources/template/css_xhtml/hidden.ftl   |   2 -
 .../main/resources/template/css_xhtml/label.ftl    |   2 -
 .../main/resources/template/css_xhtml/reset.ftl    |   2 -
 .../resources/template/css_xhtml/submit-close.ftl  |  20 ++
 .../main/resources/template/css_xhtml/submit.ftl   |   2 -
 .../resources/template/css_xhtml/theme.properties  |   2 -
 .../src/main/resources/template/simple/a-close.ftl |   2 -
 core/src/main/resources/template/simple/a.ftl      |   2 -
 .../main/resources/template/simple/actionerror.ftl |   2 -
 .../resources/template/simple/actionmessage.ftl    |   2 -
 .../main/resources/template/simple/checkbox.ftl    |   2 -
 .../resources/template/simple/checkboxlist.ftl     |   2 -
 .../main/resources/template/simple/combobox.ftl    |   2 -
 .../template/simple/common-attributes.ftl          |   2 -
 .../resources/template/simple/controlfooter.ftl    |   2 -
 .../resources/template/simple/controlheader.ftl    |   2 -
 core/src/main/resources/template/simple/css.ftl    |   2 -
 core/src/main/resources/template/simple/debug.ftl  |   2 -
 .../resources/template/simple/doubleselect.ftl     |   2 -
 .../template/simple/dynamic-attributes.ftl         |   2 -
 core/src/main/resources/template/simple/empty.ftl  |   2 -
 .../main/resources/template/simple/fielderror.ftl  |   2 -
 core/src/main/resources/template/simple/file.ftl   |   2 -
 .../main/resources/template/simple/form-close.ftl  |   2 -
 core/src/main/resources/template/simple/form.ftl   |   2 -
 core/src/main/resources/template/simple/head.ftl   |   2 -
 core/src/main/resources/template/simple/hidden.ftl |   2 -
 .../template/simple/inputtransferselect.ftl        |   2 -
 core/src/main/resources/template/simple/label.ftl  |   2 -
 .../main/resources/template/simple/optgroup.ftl    |   2 -
 .../template/simple/optiontransferselect.ftl       |   2 -
 .../main/resources/template/simple/password.ftl    |   2 -
 .../main/resources/template/simple/radiomap.ftl    |   2 -
 core/src/main/resources/template/simple/reset.ftl  |   2 -
 .../resources/template/simple/scripting-events.ftl |   2 -
 core/src/main/resources/template/simple/select.ftl |   2 -
 .../resources/template/simple/submit-close.ftl     |  20 ++
 core/src/main/resources/template/simple/submit.ftl |   2 -
 core/src/main/resources/template/simple/text.ftl   |   2 -
 .../main/resources/template/simple/textarea.ftl    |   2 -
 core/src/main/resources/template/simple/token.ftl  |   2 -
 .../resources/template/simple/updownselect.ftl     |   2 -
 .../src/main/resources/template/xhtml/checkbox.ftl |   2 -
 .../main/resources/template/xhtml/checkboxlist.ftl |   2 -
 .../src/main/resources/template/xhtml/combobox.ftl |   2 -
 .../resources/template/xhtml/control-close.ftl     |   2 -
 core/src/main/resources/template/xhtml/control.ftl |   2 -
 .../resources/template/xhtml/controlfooter.ftl     |   2 -
 .../template/xhtml/controlheader-core.ftl          |   2 -
 .../resources/template/xhtml/controlheader.ftl     |   2 -
 .../main/resources/template/xhtml/doubleselect.ftl |   2 -
 core/src/main/resources/template/xhtml/file.ftl    |   2 -
 .../template/xhtml/form-close-validate.ftl         |   2 -
 .../main/resources/template/xhtml/form-close.ftl   |   2 -
 .../resources/template/xhtml/form-validate.ftl     |   2 -
 core/src/main/resources/template/xhtml/form.ftl    |   2 -
 core/src/main/resources/template/xhtml/head.ftl    |   2 -
 core/src/main/resources/template/xhtml/hidden.ftl  |   2 -
 .../template/xhtml/inputtransferselect.ftl         |   2 -
 core/src/main/resources/template/xhtml/label.ftl   |   2 -
 .../template/xhtml/optiontransferselect.ftl        |   2 -
 .../src/main/resources/template/xhtml/password.ftl |   2 -
 .../src/main/resources/template/xhtml/radiomap.ftl |   2 -
 core/src/main/resources/template/xhtml/reset.ftl   |   2 -
 core/src/main/resources/template/xhtml/select.ftl  |   2 -
 .../main/resources/template/xhtml/submit-close.ftl |   2 -
 core/src/main/resources/template/xhtml/submit.ftl  |   2 -
 core/src/main/resources/template/xhtml/text.ftl    |   2 -
 .../src/main/resources/template/xhtml/textarea.ftl |   2 -
 .../main/resources/template/xhtml/theme.properties |   2 -
 core/src/main/resources/template/xhtml/tooltip.ftl |   2 -
 .../main/resources/template/xhtml/updownselect.ftl |   2 -
 core/src/main/resources/xwork-1.0.dtd              |  21 +-
 core/src/main/resources/xwork-1.1.1.dtd            |  21 +-
 core/src/main/resources/xwork-1.1.2.dtd            |  21 +-
 core/src/main/resources/xwork-1.1.dtd              |  21 +-
 core/src/main/resources/xwork-2.0.dtd              |  21 +-
 core/src/main/resources/xwork-2.1.3.dtd            |  21 +-
 core/src/main/resources/xwork-2.1.dtd              |  21 +-
 core/src/main/resources/xwork-2.3.dtd              |  21 +-
 core/src/main/resources/xwork-2.5.dtd              |  21 +-
 core/src/main/resources/xwork-default.xml          |  20 ++
 core/src/main/resources/xwork-validator-1.0.2.dtd  |  21 +-
 core/src/main/resources/xwork-validator-1.0.3.dtd  |  21 +-
 core/src/main/resources/xwork-validator-1.0.dtd    |  21 +-
 .../main/resources/xwork-validator-config-1.0.dtd  |  21 +-
 .../resources/xwork-validator-definition-1.0.dtd   |  21 +-
 .../site/confluence/ww-template-autoexport.html    |   2 -
 core/src/site/site.xml                             |   2 +-
 core/src/test/java/PackagelessAction.java          |  30 +-
 .../com/opensymphony/xwork2/ActionContextTest.java |  29 +-
 .../xwork2/ActionContextThreadLocalTest.java       |  29 +-
 .../opensymphony/xwork2/ActionInvocationTest.java  |  29 +-
 .../com/opensymphony/xwork2/ActionNestingTest.java |  29 +-
 .../com/opensymphony/xwork2/ActionSupportTest.java |  29 +-
 .../com/opensymphony/xwork2/AnnotatedTestBean.java |  29 +-
 .../com/opensymphony/xwork2/ChainResultTest.java   |  33 +-
 .../xwork2/CompositeTextProviderTest.java          |  18 ++
 .../xwork2/DefaultActionInvocationTest.java        |  18 ++
 .../xwork2/DefaultActionProxyTest.java             |  18 ++
 .../com/opensymphony/xwork2/DefaultClasstTest.java |  30 +-
 .../xwork2/DefaultTextProviderTest.java            |  29 +-
 .../xwork2/ExternalReferenceAction.java            |  33 +-
 .../src/test/java/com/opensymphony/xwork2/Foo.java |  33 +-
 .../java/com/opensymphony/xwork2/GenericsBean.java |  18 ++
 .../com/opensymphony/xwork2/LocaleAwareTest.java   |  29 +-
 .../com/opensymphony/xwork2/ModelDrivenAction.java |  29 +-
 .../xwork2/ModelDrivenAnnotationAction.java        |  29 +-
 .../java/com/opensymphony/xwork2/NestedAction.java |  29 +-
 .../opensymphony/xwork2/ProxyInvocationAction.java |  18 ++
 .../xwork2/ProxyInvocationInterface.java           |  18 ++
 .../opensymphony/xwork2/ProxyInvocationTest.java   |  18 ++
 .../opensymphony/xwork2/ProxyObjectFactory.java    |  18 ++
 .../java/com/opensymphony/xwork2/SimpleAction.java |  29 +-
 .../xwork2/SimpleAnnotationAction.java             |  29 +-
 .../com/opensymphony/xwork2/SimpleFooAction.java   |  29 +-
 .../com/opensymphony/xwork2/StubValueStack.java    |  29 +-
 .../java/com/opensymphony/xwork2/TestBean.java     |  29 +-
 .../com/opensymphony/xwork2/TestChildBean.java     |  29 +-
 .../com/opensymphony/xwork2/TestInterceptor.java   |  29 +-
 .../xwork2/TestNGXWorkTestCaseTest.java            |  29 +-
 .../java/com/opensymphony/xwork2/TestSubBean.java  |  18 ++
 .../xwork2/TextProviderSupportTest.java            |  30 +-
 .../xwork2/UnknownHandlerManagerMock.java          |  18 ++
 .../xwork2/UserSpecifiedDefaultAction.java         |  18 ++
 .../opensymphony/xwork2/ValidationOrderAction.java |  29 +-
 .../java/com/opensymphony/xwork2/VoidResult.java   |  29 +-
 .../opensymphony/xwork2/WildCardResultTest.java    |  30 +-
 .../opensymphony/xwork2/XWorkExceptionTest.java    |  29 +-
 .../xwork2/config/ConfigurationManagerTest.java    |  31 +-
 .../xwork2/config/ConfigurationTest.java           |  29 +-
 .../xwork2/config/entities/ActionConfigTest.java   |  29 +-
 .../xwork2/config/entities/AllowedMethodsTest.java |  18 ++
 .../xwork2/config/entities/PackageConfigTest.java  |  29 +-
 .../config/impl/ActionConfigMatcherTest.java       |  27 +-
 .../xwork2/config/impl/NamespaceMatcherTest.java   |  29 +-
 .../config/providers/ConfigurationTestBase.java    |  32 +-
 .../config/providers/EnvsValueSubstitutorTest.java |  18 ++
 .../config/providers/InterceptorBuilderTest.java   |  18 ++
 .../providers/InterceptorForTestPurpose.java       |  29 +-
 .../providers/MockConfigurationProvider.java       |  29 +-
 .../providers/NoNoArgsConstructorAction.java       |  18 ++
 .../config/providers/PrivateConstructorAction.java |  29 +-
 .../config/providers/SomeUnknownHandler.java       |  29 +-
 .../XmlConfigurationProviderActionsTest.java       |  29 +-
 ...XmlConfigurationProviderAllowedMethodsTest.java |  25 +-
 ...lConfigurationProviderEnvsSubstitutionTest.java |  25 +-
 ...ConfigurationProviderExceptionMappingsTest.java |  18 ++
 ...urationProviderGlobalResultInheritenceTest.java |  18 ++
 ...tionProviderInterceptorParamOverridingTest.java |  29 +-
 ...roviderInterceptorStackParamOverridingTest.java |  18 ++
 ...onfigurationProviderInterceptorsSpringTest.java |  29 +-
 .../XmlConfigurationProviderInterceptorsTest.java  |  29 +-
 .../XmlConfigurationProviderInvalidFileTest.java   |  29 +-
 .../XmlConfigurationProviderMultilevelTest.java    |  29 +-
 .../XmlConfigurationProviderPackagesTest.java      |  29 +-
 .../XmlConfigurationProviderResultTypesTest.java   |  29 +-
 .../XmlConfigurationProviderResultsTest.java       |  29 +-
 .../providers/XmlConfigurationProviderTest.java    |  29 +-
 ...nfigurationProviderUnknownHandlerStackTest.java |  18 ++
 ...mlConfigurationProviderWildCardIncludeTest.java |  29 +-
 .../xwork2/config/providers/XmlHelperTest.java     |  18 ++
 .../xwork2/conversion/ConversionTestAction.java    |  29 +-
 .../impl/AnnotationXWorkConverterTest.java         |  29 +-
 .../xwork2/conversion/impl/FooBarConverter.java    |  29 +-
 .../xwork2/conversion/impl/FooNumberConverter.java |  18 ++
 .../impl/InstantiatingNullHandlerTest.java         |  29 +-
 .../conversion/impl/NumberConverterTest.java       |  18 ++
 .../xwork2/conversion/impl/ParentClass.java        |  18 ++
 .../conversion/impl/StringConverterTest.java       |  18 ++
 .../conversion/impl/XWorkBasicConverterTest.java   |  29 +-
 .../xwork2/conversion/impl/XWorkConverterTest.java |  29 +-
 .../xwork2/inject/ContainerImplTest.java           |  18 ++
 .../xwork2/interceptor/AliasInterceptorTest.java   |  29 +-
 .../interceptor/ChainingInterceptorTest.java       |  29 +-
 .../ChainingInterceptorWithConfigTest.java         |  29 +-
 .../ConversionErrorInterceptorTest.java            |  29 +-
 .../DefaultWorkflowInterceptorTest.java            |  29 +-
 .../ExceptionMappingInterceptorTest.java           |  29 +-
 .../MethodFilterInterceptorUtilTest.java           |  29 +-
 .../interceptor/ModelDrivenInterceptorTest.java    |  29 +-
 .../ParameterFilterInterceptorTest.java            |  29 +-
 .../ParameterRemoverInterceptorTest.java           |  18 ++
 .../interceptor/ParametersInterceptorTest.java     |  29 +-
 .../xwork2/interceptor/PreResultListenerTest.java  |  29 +-
 .../PrefixMethodInvocationUtilTest.java            |  29 +-
 .../xwork2/interceptor/PrepareInterceptorTest.java |  30 +-
 .../ScopedModelDrivenInterceptorTest.java          |  29 +-
 .../StaticParametersInterceptorTest.java           |  29 +-
 .../xwork2/interceptor/TimerInterceptorTest.java   |  29 +-
 .../interceptor/ValidationErrorAwareTest.java      |  18 ++
 ...ationInterceptorPrefixMethodInvocationTest.java |  29 +-
 .../annotations/AllowingByDefaultAction.java       |  18 ++
 .../annotations/AllowingByDefaultModel.java        |  19 ++
 .../interceptor/annotations/AnnotatedAction.java   |  29 +-
 .../AnnotationParameterFilterInterceptorTest.java  |  18 ++
 .../AnnotationWorkflowInterceptorTest.java         |  29 +-
 .../annotations/BaseAnnotatedAction.java           |  29 +-
 .../annotations/BlockingByDefaultAction.java       |  18 ++
 .../annotations/BlockingByDefaultModel.java        |  18 ++
 .../annotations/InterfaceAnnotatedAction.java      |  18 ++
 .../annotations/ShortcircuitedAction.java          |  29 +-
 .../xwork2/mock/MockLazyInterceptor.java           |  29 +-
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java |  29 +-
 .../xwork2/ognl/OgnlValueStackTest.java            |  29 +-
 .../xwork2/ognl/SecurityMemberAccessProxyTest.java |  18 ++
 .../xwork2/ognl/SecurityMemberAccessTest.java      |  18 ++
 .../xwork2/ognl/SetPropertiesTest.java             |  31 +-
 .../accessor/XWorkListPropertyAccessorTest.java    |  17 +-
 .../accessor/XWorkMapPropertyAccessorTest.java     |  18 ++
 .../DefaultAcceptedPatternsCheckerTest.java        |  18 ++
 .../DefaultExcludedPatternsCheckerTest.java        |  18 ++
 .../xwork2/spring/ActionsFromSpringTest.java       |  17 +-
 .../java/com/opensymphony/xwork2/spring/Bar.java   |  17 +-
 .../xwork2/spring/ExecuteInterceptor.java          |  17 +-
 .../xwork2/spring/ExternalReferenceAction.java     |  17 +-
 .../java/com/opensymphony/xwork2/spring/Foo.java   |  17 +-
 .../xwork2/spring/SpringObjectFactoryTest.java     |  35 +-
 .../xwork2/spring/SpringProxyUtilTest.java         |  25 +-
 .../opensymphony/xwork2/spring/SpringResult.java   |  18 ++
 .../com/opensymphony/xwork2/spring/TestAspect.java |  18 ++
 .../ActionAutowiringInterceptorTest.java           |  17 +-
 .../spring/interceptor/TestActionInvocation.java   |  17 +-
 .../xwork2/test/AnnotationDataAware.java           |  29 +-
 .../xwork2/test/AnnotationDataAware2.java          |  29 +-
 .../xwork2/test/AnnotationTestBean2.java           |  29 +-
 .../opensymphony/xwork2/test/AnnotationUser.java   |  29 +-
 .../xwork2/test/AnnotationUserMarker.java          |  29 +-
 .../com/opensymphony/xwork2/test/DataAware.java    |  29 +-
 .../com/opensymphony/xwork2/test/DataAware2.java   |  29 +-
 .../java/com/opensymphony/xwork2/test/Equidae.java |  29 +-
 .../xwork2/test/ModelDrivenAction2.java            |  29 +-
 .../xwork2/test/ModelDrivenAnnotationAction2.java  |  29 +-
 .../opensymphony/xwork2/test/SimpleAction2.java    |  29 +-
 .../opensymphony/xwork2/test/SimpleAction3.java    |  29 +-
 .../xwork2/test/SimpleAnnotationAction2.java       |  29 +-
 .../xwork2/test/SimpleAnnotationAction3.java       |  29 +-
 .../com/opensymphony/xwork2/test/TestBean2.java    |  29 +-
 .../java/com/opensymphony/xwork2/test/User.java    |  29 +-
 .../com/opensymphony/xwork2/test/UserMarker.java   |  29 +-
 .../xwork2/test/annotations/Address.java           |  18 ++
 .../test/annotations/AddressTypeConverter.java     |  18 ++
 .../xwork2/test/annotations/Person.java            |  18 ++
 .../xwork2/test/annotations/PersonAction.java      |  18 ++
 .../xwork2/test/annotations/PersonActionTest.java  |  18 ++
 .../test/annotations/PersonTypeConverter.java      |  18 ++
 .../ValidateAnnotatedMethodOnlyAction.java         |  18 ++
 .../xwork2/test/subtest/NullModelDrivenAction.java |  18 ++
 .../com/opensymphony/xwork2/util/AnnotatedCat.java |  29 +-
 .../xwork2/util/AnnotationUtilsTest.java           |  18 ++
 .../java/com/opensymphony/xwork2/util/Bar.java     |  29 +-
 .../com/opensymphony/xwork2/util/BarJunior.java    |  18 ++
 .../java/com/opensymphony/xwork2/util/Cat.java     |  29 +-
 .../xwork2/util/ClassLoaderUtilTest.java           |  29 +-
 .../xwork2/util/ClassPathFinderTest.java           |  27 +-
 .../xwork2/util/DefaultFileManagerTest.java        |  18 ++
 .../java/com/opensymphony/xwork2/util/Dog.java     |  29 +-
 .../opensymphony/xwork2/util/DomHelperTest.java    |  29 +-
 .../java/com/opensymphony/xwork2/util/Foo.java     |  29 +-
 .../com/opensymphony/xwork2/util/FurColor.java     |  29 +-
 .../xwork2/util/GetPropertiesTest.java             |  18 +-
 .../java/com/opensymphony/xwork2/util/Indexed.java |  18 ++
 .../com/opensymphony/xwork2/util/ListHolder.java   |  18 ++
 .../java/com/opensymphony/xwork2/util/MyBean.java  |  29 +-
 .../com/opensymphony/xwork2/util/MyBeanAction.java |  29 +-
 .../opensymphony/xwork2/util/MyBeanActionTest.java |  29 +-
 .../util/NamedVariablePatternMatcherTest.java      |  29 +-
 .../java/com/opensymphony/xwork2/util/Owner.java   |  29 +-
 .../opensymphony/xwork2/util/ResolverUtilTest.java |  29 +-
 .../util/StrutsLocalizedTextProviderTest.java      |  29 +-
 .../xwork2/util/TextParseUtilTest.java             |  29 +-
 .../java/com/opensymphony/xwork2/util/Tiger.java   |  29 +-
 .../xwork2/util/UnknownHandlerManagerTest.java     |  18 ++
 .../com/opensymphony/xwork2/util/UrlUtilTest2.java |  18 ++
 .../xwork2/util/WildcardHelperTest.java            |  27 +-
 .../opensymphony/xwork2/util/WildcardUtilTest.java |  27 +-
 .../opensymphony/xwork2/util/XWorkListTest.java    |  29 +-
 .../xwork2/util/annotation/Dummy2Class.java        |  18 ++
 .../xwork2/util/annotation/DummyClass.java         |  18 ++
 .../xwork2/util/annotation/DummyClassExt.java      |  18 ++
 .../xwork2/util/annotation/MyAnnotation.java       |  18 ++
 .../xwork2/util/annotation/MyAnnotation2.java      |  18 ++
 .../xwork2/util/annotation/package-info.java       |   2 -
 .../util/fs/DefaultFileManagerFactoryTest.java     |  18 ++
 .../util/location/LocationAttributesTest.java      |  29 +-
 .../xwork2/util/location/LocationImplTest.java     |  29 +-
 .../xwork2/util/location/LocationUtilsTest.java    |  29 +-
 .../xwork2/util/logging/LoggerUtilsTest.java       |  18 ++
 .../util/profiling/ProfilingTimerBeanTest.java     |  29 +-
 .../xwork2/util/profiling/UtilTimerStackTest.java  |  29 +-
 .../validator/ActionValidatorManagerTest.java      |  18 ++
 .../AnnotationActionValidatorManagerTest.java      |  29 +-
 .../validator/AnnotationValidationAction.java      |  18 ++
 ...notationValidationConfigurationBuilderTest.java |  18 ++
 .../validator/AnnotationValidationExpAction.java   |  18 ++
 .../ConversionErrorFieldValidatorTest.java         |  29 +-
 .../xwork2/validator/DateRangeValidatorTest.java   |  29 +-
 .../DefaultActionValidatorManagerTest.java         |  29 +-
 .../validator/DefaultValidatorFactoryTest.java     |  29 +-
 .../validator/DefaultValidatorFileParserTest.java  |  39 +--
 .../validator/DoubleRangeFieldValidatorTest.java   |  18 ++
 .../xwork2/validator/DummyValidatorContext.java    |  29 +-
 .../xwork2/validator/EmailValidatorTest.java       |  29 +-
 .../xwork2/validator/ExpressionValidatorTest.java  |  29 +-
 .../xwork2/validator/IntRangeValidatorTest.java    |  29 +-
 .../xwork2/validator/LongRangeValidatorTest.java   |  29 +-
 .../validator/ModelDrivenValidationTest.java       |  29 +-
 .../opensymphony/xwork2/validator/MyValidator.java |  18 ++
 .../xwork2/validator/RegexFieldValidatorTest.java  |  29 +-
 ...teConversionErrorFieldValidatorSupportTest.java |  29 +-
 .../xwork2/validator/ShortRangeValidatorTest.java  |  29 +-
 .../validator/SimpleActionValidationTest.java      |  29 +-
 .../validator/StringLengthFieldValidatorTest.java  |  29 +-
 .../xwork2/validator/StringValidatorTest.java      |  29 +-
 .../xwork2/validator/URLValidatorTest.java         |  29 +-
 .../xwork2/validator/ValidatorAnnotationTest.java  |  18 ++
 .../validator/VisitorFieldValidatorModelTest.java  |  29 +-
 .../validator/VisitorFieldValidatorTest.java       |  29 +-
 .../validator/VisitorValidatorModelAction.java     |  29 +-
 .../validator/VisitorValidatorTestAction.java      |  29 +-
 .../validators/AppendingValidatorContextTest.java  |  18 ++
 .../validators/CreditCardValidatorTest.java        |  18 ++
 .../validators/DateRangeFieldValidatorTest.java    |  18 ++
 .../validators/IntRangeFieldValidatorTest.java     |  18 ++
 .../validators/LongRangeFieldValidatorTest.java    |  18 ++
 .../validators/RequiredFieldValidatorTest.java     |  18 ++
 .../validators/RequiredStringValidatorTest.java    |  18 ++
 .../validators/ShortRangeFieldValidatorTest.java   |  18 ++
 .../validator/validators/ValidationAction.java     |  18 ++
 .../validator/validators/ValidatorSupportTest.java |  29 +-
 .../org/apache/struts2/ClassInstantiationTest.java |  18 ++
 .../apache/struts2/ExecutionCountTestAction.java   |   3 -
 .../java/org/apache/struts2/RequestUtilsTest.java  |   3 -
 .../apache/struts2/ServletActionContextTest.java   |   3 -
 .../src/test/java/org/apache/struts2/SomeEnum.java |   3 -
 .../org/apache/struts2/StrutsInternalTestCase.java |   3 -
 .../test/java/org/apache/struts2/TestAction.java   |   3 -
 .../org/apache/struts2/TestActionTagResult.java    |   3 -
 .../apache/struts2/TestConfigurationProvider.java  |   3 -
 .../test/java/org/apache/struts2/TestResult.java   |   3 -
 .../test/java/org/apache/struts2/TestUtils.java    |   3 -
 .../struts2/components/ActionComponentTest.java    |   3 -
 .../components/AnotherActionComponentTest.java     |  18 ++
 .../apache/struts2/components/ComponentTest.java   |   3 -
 .../apache/struts2/components/FormButtonTest.java  |   3 -
 .../org/apache/struts2/components/FormTest.java    |   3 -
 .../struts2/components/IteratorComponentTest.java  |  18 ++
 .../apache/struts2/components/PropertyTest.java    |   3 -
 .../org/apache/struts2/components/UIBeanTest.java  |   3 -
 .../apache/struts2/components/UIComponentTest.java |   3 -
 .../template/BaseTemplateEngineTest.java           |   3 -
 .../components/template/JspTemplateEngineTest.java |  18 ++
 .../config/DefaultBeanSelectionProviderTest.java   |   3 -
 .../PropertiesConfigurationProviderTest.java       |   3 -
 .../org/apache/struts2/config/SettingsTest.java    |   3 -
 .../org/apache/struts2/config/TestSettings.java    |   3 -
 .../conversion/UploadedFileConverterTest.java      |  18 ++
 .../dispatcher/DefaultStaticContentLoaderTest.java |  18 ++
 .../apache/struts2/dispatcher/DispatcherTest.java  |   3 -
 .../struts2/dispatcher/NullActionMapper.java       |   3 -
 .../apache/struts2/dispatcher/ParameterTest.java   |  18 ++
 .../ServletDispatchedTestAssertInterceptor.java    |   3 -
 .../apache/struts2/dispatcher/SessionMapTest.java  |   3 -
 .../dispatcher/StaticContentLoaderTest.java        |   4 +-
 .../mapper/CompositeActionMapperTest.java          |   3 -
 .../dispatcher/mapper/DefaultActionMapperTest.java |   4 -
 .../mapper/Restful2ActionMapperTest.java           |   3 -
 .../dispatcher/mapper/RestfulActionMapperTest.java |   3 -
 .../JakartaStreamMultiPartRequestTest.java         |  21 +-
 ...rutsPrepareAndExecuteFilterIntegrationTest.java |   2 -
 .../dispatcher/ng/TwoFilterIntegrationTest.java    |   2 -
 .../apache/struts2/factory/MyResultFactory.java    |  18 ++
 .../struts2/factory/StrutsResultFactoryTest.java   |  18 ++
 .../interceptor/CheckboxInterceptorTest.java       |   3 -
 .../interceptor/ClearSessionInterceptorTest.java   |   3 -
 .../struts2/interceptor/CookieInterceptorTest.java |   3 -
 .../interceptor/CookieProviderInterceptorTest.java |  18 ++
 .../interceptor/CreateSessionInterceptorTest.java  |   3 -
 .../interceptor/DateTextFieldInterceptorTest.java  |  18 ++
 .../interceptor/ExecuteAndWaitDelayAction.java     |   3 -
 .../interceptor/ExecuteAndWaitInterceptorTest.java |   3 -
 .../interceptor/FileUploadInterceptorTest.java     |   3 -
 .../struts2/interceptor/I18nInterceptorTest.java   |   2 -
 .../interceptor/MessageStoreInterceptorTest.java   |   3 -
 .../MessageStorePreResultListenerTest.java         |  18 ++
 .../interceptor/MultiselectInterceptorTest.java    |   4 -
 .../struts2/interceptor/RolesInterceptorTest.java  |   3 -
 .../interceptor/ServletConfigInterceptorTest.java  |   3 -
 .../StrutsConversionErrorInterceptorTest.java      |   3 -
 .../struts2/interceptor/TokenInterceptorTest.java  |   3 -
 .../TokenSessionStoreInterceptorTest.java          |   3 -
 .../AnnotationValidationInterceptorTest.java       |   3 -
 .../struts2/result/HttpHeaderResultTest.java       |   3 -
 .../apache/struts2/result/PlainTextResultTest.java |   3 -
 .../result/ServletActionRedirectResultTest.java    |   3 -
 .../result/ServletDispatcherResultTest.java        |   3 -
 .../struts2/result/ServletRedirectResultTest.java  |   3 -
 .../apache/struts2/result/StreamResultTest.java    |   3 -
 .../struts2/result/StrutsResultSupportTest.java    |   3 -
 .../apache/struts2/result/VelocityResultTest.java  |   3 -
 .../apache/struts2/util/ComponentUtilsTest.java    |  18 ++
 .../org/apache/struts2/util/ContainUtilTest.java   |   3 -
 .../java/org/apache/struts2/util/CounterTest.java  |   3 -
 .../struts2/util/InvocationSessionStoreTest.java   |   3 -
 .../org/apache/struts2/util/PrefixTrieTest.java    |   3 -
 .../struts2/util/RegexPatternMatcherTest.java      |   2 -
 .../util/SecurityMemberAccessInServletsTest.java   |   3 -
 .../struts2/util/StrutsTypeConverterTest.java      |   3 -
 .../org/apache/struts2/util/StrutsUtilTest.java    |   3 -
 .../org/apache/struts2/util/TokenHelperTest.java   |   3 -
 .../apache/struts2/util/URLDecoderUtilTest.java    |  18 ++
 .../struts2/views/TemplateEngineManagerTest.java   |   3 -
 .../views/freemarker/FreeMarkerResultTest.java     |   3 -
 .../views/freemarker/FreemarkerManagerTest.java    |   3 -
 .../freemarker/FreemarkerResultMockedTest.java     |  18 ++
 .../struts2/views/freemarker/FreemarkerTest.java   |   3 -
 .../FreemarkerThemeTemplateLoaderTest.java         |  18 ++
 .../struts2/views/freemarker/TestAction.java       |   3 -
 .../apache/struts2/views/freemarker/TestBean.java  |   3 -
 .../views/freemarker/tags/TagModelTest.java        |   3 -
 .../apache/struts2/views/jsp/AbstractTagTest.java  |   3 -
 .../struts2/views/jsp/AbstractUITagTest.java       |   3 -
 .../apache/struts2/views/jsp/ActionTagTest.java    |   3 -
 .../apache/struts2/views/jsp/AnchorTagTest.java    |   3 -
 .../struts2/views/jsp/AppendIteratorTagTest.java   |   3 -
 .../org/apache/struts2/views/jsp/BeanTagTest.java  |   3 -
 .../apache/struts2/views/jsp/DynAttribsTest.java   |   3 -
 .../apache/struts2/views/jsp/ElseIfTagTest.java    |   3 -
 .../org/apache/struts2/views/jsp/ElseTagTest.java  |   3 -
 .../org/apache/struts2/views/jsp/I18nTagTest.java  |   3 -
 .../org/apache/struts2/views/jsp/IfTagTest.java    |   3 -
 .../apache/struts2/views/jsp/IncludeTagTest.java   |   3 -
 .../views/jsp/IteratorGeneratorTagTest.java        |   3 -
 .../apache/struts2/views/jsp/IteratorTagTest.java  |   3 -
 .../struts2/views/jsp/MergeIteratorTagTest.java    |   3 -
 .../apache/struts2/views/jsp/NumberTagTest.java    |  18 ++
 .../apache/struts2/views/jsp/PropertyTagTest.java  |   3 -
 .../org/apache/struts2/views/jsp/PushTagTest.java  |   3 -
 .../org/apache/struts2/views/jsp/SetTagTest.java   |   3 -
 .../struts2/views/jsp/SortIteratorTagTest.java     |   3 -
 .../struts2/views/jsp/StrutsMockBodyContent.java   |   3 -
 .../views/jsp/StrutsMockHttpServletRequest.java    |   3 -
 .../views/jsp/StrutsMockHttpServletResponse.java   |   3 -
 .../struts2/views/jsp/StrutsMockHttpSession.java   |   3 -
 .../struts2/views/jsp/StrutsMockJspWriter.java     |   3 -
 .../struts2/views/jsp/StrutsMockPageContext.java   |   3 -
 .../views/jsp/StrutsMockServletContext.java        |   3 -
 .../struts2/views/jsp/SubsetIteratorTagTest.java   |   3 -
 .../org/apache/struts2/views/jsp/TextTagTest.java  |   3 -
 .../org/apache/struts2/views/jsp/URLTagTest.java   |   3 -
 .../struts2/views/jsp/ui/ActionErrorTagTest.java   |   3 -
 .../struts2/views/jsp/ui/ActionMessageTagTest.java |   3 -
 .../apache/struts2/views/jsp/ui/AnchorTest.java    |   3 -
 .../struts2/views/jsp/ui/CheckboxListTest.java     |   3 -
 .../apache/struts2/views/jsp/ui/CheckboxTest.java  |   3 -
 .../apache/struts2/views/jsp/ui/ComboBoxTest.java  |   3 -
 .../apache/struts2/views/jsp/ui/ComponentTest.java |   3 -
 .../apache/struts2/views/jsp/ui/DateTagTest.java   |   3 -
 .../struts2/views/jsp/ui/DoubleSelectTest.java     |   3 -
 .../views/jsp/ui/DoubleValidationAction.java       |   3 -
 .../struts2/views/jsp/ui/FieldErrorTagTest.java    |   3 -
 .../org/apache/struts2/views/jsp/ui/FileTest.java  |   3 -
 .../apache/struts2/views/jsp/ui/FormTagTest.java   |   3 -
 .../apache/struts2/views/jsp/ui/HeadTagTest.java   |   3 -
 .../apache/struts2/views/jsp/ui/HiddenTest.java    |   3 -
 .../views/jsp/ui/InputTransferSelectTagTest.java   |   3 -
 .../struts2/views/jsp/ui/IntValidationAction.java  |   3 -
 .../struts2/views/jsp/ui/JspTemplateTest.java      |   3 -
 .../org/apache/struts2/views/jsp/ui/LabelTest.java |   3 -
 .../struts2/views/jsp/ui/LocaleKeyValueTest.java   |  18 ++
 .../struts2/views/jsp/ui/LocaleTestAction.java     |  18 ++
 .../org/apache/struts2/views/jsp/ui/MockTag.java   |   3 -
 .../apache/struts2/views/jsp/ui/OptGroupTest.java  |   3 -
 .../views/jsp/ui/OptionTransferSelectTagTest.java  |   3 -
 .../apache/struts2/views/jsp/ui/PasswordTest.java  |   3 -
 .../org/apache/struts2/views/jsp/ui/RadioTest.java |   3 -
 .../org/apache/struts2/views/jsp/ui/ResetTest.java |   3 -
 .../apache/struts2/views/jsp/ui/SelectTest.java    |   3 -
 .../struts2/views/jsp/ui/StrutsBodyContent.java    |   3 -
 .../apache/struts2/views/jsp/ui/SubmitTest.java    |   3 -
 .../apache/struts2/views/jsp/ui/TestAction1.java   |   3 -
 .../apache/struts2/views/jsp/ui/TextareaTest.java  |   3 -
 .../apache/struts2/views/jsp/ui/TextfieldTest.java |   3 -
 .../apache/struts2/views/jsp/ui/TokenTagTest.java  |   3 -
 .../apache/struts2/views/jsp/ui/TooltipTest.java   |   3 -
 .../struts2/views/jsp/ui/UpDownSelectTagTest.java  |   3 -
 .../java/org/apache/struts2/views/jsp/ui/User.java |   3 -
 .../struts2/views/jsp/ui/ValidationStylesTest.java |   2 -
 .../apache/struts2/views/util/ContextUtilTest.java |   3 -
 .../struts2/views/util/DefaultUrlHelperTest.java   |   3 -
 .../struts2/views/util/ResourceUtilTest.java       |   3 -
 .../apache/struts2/views/xslt/XSLTResultTest.java  |   1 -
 .../test/resources/PackagelessAction.properties    |  18 ++
 core/src/test/resources/XSLTResultTest-val.xml     |   2 -
 ...ActionSupportTest$MyActionSupport_da.properties |  19 +-
 .../xwork2/AnnotatedTestBean.properties            |  18 ++
 .../DefaultTextProviderTest_en_CA.properties       |  19 +-
 .../xwork2/ModelDrivenAction-validation.xml        |  20 ++
 .../xwork2/ModelDrivenAction.properties            |  18 ++
 .../xwork2/ModelDrivenAnnotationAction.properties  |  19 +-
 .../xwork2/SimpleAction-some-alias-validation.xml  |  20 ++
 .../xwork2/SimpleAction-subproperty-validation.xml |  20 ++
 .../xwork2/SimpleAction-validation.xml             |  20 ++
 .../SimpleAction-validationAlias-validation.xml    |  20 ++
 .../opensymphony/xwork2/SimpleAction.properties    |  18 ++
 .../opensymphony/xwork2/SimpleAction_de.properties |  18 ++
 .../opensymphony/xwork2/SimpleAction_en.properties |  18 ++
 .../xwork2/SimpleAnnotationAction.properties       |  19 +-
 .../xwork2/SimpleAnnotationAction_de.properties    |  19 +-
 .../xwork2/SimpleAnnotationAction_en.properties    |  19 +-
 .../xwork2/TestBean-anotherContext-validation.xml  |  20 ++
 .../xwork2/TestBean-badtest-validation.xml         |  20 ++
 .../TestBean-beanMessageBundle-validation.xml      |  20 ++
 .../TestBean-expressionValidation-validation.xml   |  20 ++
 .../opensymphony/xwork2/TestBean-validation.xml    |  20 ++
 .../TestBean-visitorChildValidation-validation.xml |  20 ++
 .../TestBean-visitorValidation-validation.xml      |  20 ++
 .../com/opensymphony/xwork2/TestBean.properties    |  18 ++
 .../xwork2/TestChildBean-validation.xml            |  20 ++
 .../xwork2/TextProviderSupportTest_en.properties   |  19 +-
 .../xwork2/ValidationOrderAction-validation.xml    |  21 +-
 .../providers/loadorder1/xwork-test-load-order.xml |  20 ++
 .../providers/loadorder2/xwork-test-load-order.xml |  20 ++
 .../providers/loadorder3/xwork-test-load-order.xml |  20 ++
 .../xwork2/config/providers/xwork- test.xml        |  20 ++
 .../providers/xwork-include-after-package-2.xml    |  20 ++
 .../providers/xwork-include-after-package.xml      |  20 ++
 .../providers/xwork-include-before-package-2.xml   |  20 ++
 .../providers/xwork-include-before-package.xml     |  20 ++
 .../config/providers/xwork-include-parent.xml      |  20 ++
 .../config/providers/xwork-test-action-invalid.xml |  20 ++
 .../xwork-test-actions-packagedefaultclassref.xml  |  20 ++
 .../xwork2/config/providers/xwork-test-actions.xml |  20 ++
 .../providers/xwork-test-allowed-methods.xml       |  20 ++
 .../providers/xwork-test-bad-inheritance.xml       |  20 ++
 .../config/providers/xwork-test-basic-packages.xml |  20 ++
 .../providers/xwork-test-default-package.xml       |  20 ++
 .../xwork-test-defaultclassref-package.xml         |  20 ++
 .../providers/xwork-test-envs-substitution.xml     |  20 ++
 .../providers/xwork-test-exception-mappings.xml    |  20 ++
 .../xwork-test-global-result-inheritence.xml       |  20 ++
 .../providers/xwork-test-include-wildcard.xml      |  20 ++
 .../xwork-test-interceptor-defaultref.xml          |  20 ++
 .../xwork-test-interceptor-inheritance.xml         |  20 ++
 .../xwork-test-interceptor-param-overriding.xml    |  20 ++
 .../providers/xwork-test-interceptor-params.xml    |  20 ++
 ...ork-test-interceptor-stack-param-overriding.xml |  20 ++
 .../providers/xwork-test-interceptors-basic.xml    |  20 ++
 .../providers/xwork-test-interceptors-spring.xml   |  20 ++
 .../config/providers/xwork-test-invalid-file.xml   |  20 ++
 .../config/providers/xwork-test-multilevel.xml     |  20 ++
 .../providers/xwork-test-package-inheritance.xml   |  20 ++
 .../providers/xwork-test-result-inheritance.xml    |  20 ++
 .../config/providers/xwork-test-result-names.xml   |  20 ++
 .../config/providers/xwork-test-result-types.xml   |  21 +-
 .../xwork2/config/providers/xwork-test-results.xml |  20 ++
 .../config/providers/xwork-test-wildcard-1.xml     |  20 ++
 .../config/providers/xwork-test-wildcard-2.xml     |  20 ++
 .../providers/xwork-test-wildcard-include.xml      |  20 ++
 .../providers/xwork-unknownhandler-stack-empty.xml |  20 ++
 .../providers/xwork-unknownhandler-stack.xml       |  20 ++
 .../impl/test-xwork-conversion.properties          |  18 ++
 .../xwork2/spring/actionContext-spring.xml         |  20 ++
 .../xwork2/spring/actionContext-xwork.xml          |  20 ++
 .../opensymphony/xwork2/spring/autowireContext.xml |  20 ++
 .../xwork2/spring/resolverApplicationContext.xml   |  20 ++
 .../opensymphony/xwork2/spring/xwork-autowire.xml  |  20 ++
 .../com/opensymphony/xwork2/test.properties        |  18 ++
 .../xwork2/test/DataAware-conversion.properties    |  18 ++
 .../xwork2/test/DataAware-validation.xml           |  20 ++
 .../test/DataAware-validationAlias-validation.xml  |  20 ++
 .../opensymphony/xwork2/test/DataAware.properties  |  18 ++
 .../xwork2/test/DataAware2-validation.xml          |  20 ++
 .../xwork2/test/Equidae-validation.xml             |  20 ++
 .../xwork2/test/SimpleAction2-validation.xml       |  20 ++
 .../SimpleAction2-validationAlias-validation.xml   |  20 ++
 .../xwork2/test/TestBean2-conversion.properties    |  18 ++
 .../xwork2/test/User-conversion.properties         |  18 ++
 .../opensymphony/xwork2/test/User-validation.xml   |  20 ++
 .../xwork2/test/UserMarker-validation.xml          |  20 ++
 .../opensymphony/xwork2/test/package.properties    |  18 ++
 .../com/opensymphony/xwork2/util/Bar.properties    |  18 ++
 .../xwork2/util/Cat-conversion.properties          |  18 ++
 .../com/opensymphony/xwork2/util/FindMe.properties |  18 ++
 .../xwork2/util/Foo-conversion.properties          |  18 ++
 .../xwork2/util/ListHolder-conversion.properties   |  18 ++
 .../xwork2/util/LocalizedTextUtilTest.properties   |  18 ++
 .../xwork2/util/MyBeanAction-conversion.properties |  18 ++
 .../xwork2/util/Tiger-conversion.properties        |  18 ++
 .../opensymphony/xwork2/util/XW404_de.properties   |  18 ++
 .../opensymphony/xwork2/util/XW404_fr.properties   |  18 ++
 .../xwork2/util/location/xml-with-location.xml     |  20 ++
 ...ositeTextProviderTestResourceBundle1.properties |  19 ++
 ...ositeTextProviderTestResourceBundle2.properties |  19 ++
 .../VisitorValidatorModelAction-validation.xml     |  20 ++
 ...atorTestAction-beanMessageBundle-validation.xml |  20 ++
 ...alidatorTestAction-validateArray-validation.xml |  20 ++
 ...ValidatorTestAction-validateList-validation.xml |  20 ++
 .../VisitorValidatorTestAction-validation.xml      |  20 ++
 ...estAction-visitorChildValidation-validation.xml |  20 ++
 ...atorTestAction-visitorValidation-validation.xml |  20 ++
 ...estAction-visitorValidationAlias-validation.xml |  20 ++
 .../VisitorValidatorTestAction.properties          |  18 ++
 .../xwork2/validator/validator-parser-test.xml     |  20 ++
 .../xwork2/validator/validator-parser-test2.xml    |  22 +-
 .../xwork2/validator/validator-parser-test3.xml    |  20 ++
 .../xwork2/validator/validator-parser-test4.xml    |  20 ++
 .../xwork2/validator/validator-parser-test5.xml    |  20 ++
 .../xwork2/validator/validator-parser-test6.xml    |  20 ++
 .../xwork2/validator/validators-fail.xml           |  20 ++
 core/src/test/resources/includeTest.xml            |  20 ++
 core/src/test/resources/log4j2.xml                 |  20 ++
 core/src/test/resources/my-validators.xml          |  20 ++
 core/src/test/resources/myOther-validators.xml     |  20 ++
 .../org/apache/struts2/TestAction-validation.xml   |   2 -
 .../org/apache/struts2/TestAction.properties       |   2 -
 .../struts2/components/template/dummy.properties   |   4 +-
 .../theme1/themeThroughClassPath.properties        |   2 -
 .../theme1/themeThroughFileSystem.properties       |   2 -
 .../org/apache/struts2/components/tempo.properties |   4 +-
 .../apache/struts2/dispatcher/ng/struts-no-op.xml  |   2 -
 .../org/apache/struts2/dispatcher/someJspFile.jsp  |  25 --
 .../org/apache/struts2/othertest.properties        |   2 -
 .../org/apache/struts2/static/resource.css         |  22 +-
 .../views/freemarker/someFreeMarkerFile.ftl        |   2 -
 .../org/apache/struts2/views/jsp/WW3090-struts.xml |   2 -
 .../jsp/ui/DoubleValidationAction-validation.xml   |  20 ++
 .../jsp/ui/IntValidationAction-validation.xml      |  20 ++
 .../struts2/views/jsp/ui/TestAction1.properties    |  18 ++
 .../struts2/views/jsp/ui/TestAction1_de.properties |  18 ++
 .../struts2/views/jsp/ui/TestAction1_fr.properties |  18 ++
 .../struts2/views/jsp/ui/User-validation.xml       |  20 ++
 .../apache/struts2/views/jsp/ui/User.properties    |  18 ++
 .../struts-object-factory-result-builder.xml       |   2 -
 core/src/test/resources/struts.properties          |   2 -
 core/src/test/resources/struts.xml                 |   2 -
 .../src/test/resources/template/test/Component.ftl |   2 -
 core/src/test/resources/template/test/text.ftl     |  20 ++
 core/src/test/resources/test.properties            |   2 -
 core/src/test/resources/testmessages.properties    |   2 -
 core/src/test/resources/testmessages2.properties   |   2 -
 core/src/test/resources/validators.xml             |  20 ++
 core/src/test/resources/xwork-1.0.dtd              |  20 ++
 core/src/test/resources/xwork-class-param-test.xml |  20 ++
 core/src/test/resources/xwork-param-test.xml       |  20 ++
 core/src/test/resources/xwork-proxyinvoke.xml      |  20 ++
 core/src/test/resources/xwork-sample.xml           |  20 ++
 core/src/test/resources/xwork-test-beans.xml       |  20 ++
 core/src/test/resources/xwork-test-default.xml     |  20 ++
 core/src/test/resources/xwork-test-validation.xml  |  20 ++
 .../beanvalidation/constraints/FieldMatch.java     |   2 -
 .../validation/constant/ValidatorConstants.java    |   2 -
 .../interceptor/BeanValidationInterceptor.java     |   2 -
 .../interceptor/BeanValidationManager.java         |   2 -
 .../interceptor/DefaultBeanValidationManager.java  |   2 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 .../BeanValidationInterceptorTest.java             |   2 -
 .../apache/struts/beanvalidation/VoidResult.java   |   2 -
 .../struts/beanvalidation/actions/FieldAction.java |   2 -
 .../actions/FieldActionDoExecute.java              |  18 ++
 .../beanvalidation/actions/FieldMatchAction.java   |   2 -
 .../beanvalidation/actions/ModelDrivenAction.java  |   2 -
 .../actions/ModelDrivenActionInterface.java        |  18 ++
 .../struts/beanvalidation/models/Address.java      |   2 -
 .../struts/beanvalidation/models/Person.java       |  17 +-
 .../src/test/resources/bean-validation-test.xml    |  20 ++
 .../org/apache/struts2/cdi/CdiObjectFactory.java   |   1 -
 plugins/cdi/src/site/site.xml                      |   2 +-
 .../apache/struts2/cdi/CdiObjectFactoryTest.java   |  18 ++
 .../java/org/apache/struts2/cdi/FooConsumer.java   |  18 ++
 .../java/org/apache/struts2/cdi/FooService.java    |  18 ++
 plugins/cdi/src/test/resources/META-INF/beans.xml  |  20 ++
 plugins/cdi/src/test/resources/log4j2.xml          |  20 ++
 plugins/config-browser/pom.xml                     |   2 -
 .../struts2/config_browser/ActionNamesAction.java  |   3 -
 .../config_browser/ConfigurationHelper.java        |   3 -
 .../config_browser/ListValidatorsAction.java       |   3 -
 .../struts2/config_browser/ShowBeansAction.java    |   3 -
 .../struts2/config_browser/ShowConfigAction.java   |   4 -
 .../config_browser/ShowConstantsAction.java        |   3 -
 .../struts2/config_browser/ShowJarsAction.java     |   3 -
 .../config_browser/ShowValidatorAction.java        |   3 -
 .../main/resources/config-browser/actionNames.ftl  |   2 -
 .../src/main/resources/config-browser/error.ftl    |   2 -
 .../main/resources/config-browser/page-footer.ftl  |   2 -
 .../main/resources/config-browser/page-header.ftl  |   2 -
 .../main/resources/config-browser/showBeans.ftl    |   2 -
 .../main/resources/config-browser/showConfig.ftl   |   2 -
 .../resources/config-browser/showConstants.ftl     |   2 -
 .../src/main/resources/config-browser/showJars.ftl |   2 -
 .../resources/config-browser/showValidators.ftl    |   2 -
 .../main/resources/config-browser/simple-error.ftl |   2 -
 .../resources/config-browser/tigris-macros.ftl     |   2 -
 .../resources/config-browser/validatorDetails.ftl  |   2 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 plugins/config-browser/src/site/site.xml           |   2 +-
 plugins/convention/pom.xml                         |  20 ++
 .../convention/AbstractActionNameBuilder.java      |   1 -
 .../struts2/convention/annotation/Action.java      |   2 -
 .../struts2/convention/annotation/Actions.java     |   2 -
 .../convention/annotation/AllowedMethods.java      |  18 ++
 .../annotation/DefaultInterceptorRef.java          |   2 -
 .../convention/annotation/ExceptionMapping.java    |   2 -
 .../convention/annotation/ExceptionMappings.java   |   2 -
 .../convention/annotation/InterceptorRef.java      |   2 -
 .../convention/annotation/InterceptorRefs.java     |   2 -
 .../struts2/convention/annotation/Namespace.java   |   2 -
 .../struts2/convention/annotation/Namespaces.java  |   2 -
 .../convention/annotation/ParentPackage.java       |   2 -
 .../struts2/convention/annotation/Result.java      |   2 -
 .../struts2/convention/annotation/ResultPath.java  |   2 -
 .../struts2/convention/annotation/Results.java     |   2 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 .../convention/ConventionUnknownHandlerTest.java   |   2 -
 .../convention/DefaultResultMapBuilderTest.java    |   2 -
 .../PackageBasedActionConfigBuilderTest.java       |   2 -
 .../struts2/convention/ReflectionToolsTest.java    |   2 -
 .../convention/SEOActionNameBuilderTest.java       |   2 -
 .../apache/struts2/convention/TestInterceptor.java |  42 ++-
 .../actions/DefaultResultPathAction.java           |   2 -
 .../convention/actions/NoAnnotationAction.java     |   2 -
 .../apache/struts2/convention/actions/Skip.java    |   2 -
 .../actions/action/ActionNameAction.java           |   2 -
 .../actions/action/ActionNamesAction.java          |   2 -
 .../actions/action/ClassLevelAnnotationAction.java |   2 -
 .../ClassLevelAnnotationDefaultMethodAction.java   |   2 -
 .../action/ClassLevelAnnotationsAction.java        |   2 -
 .../ClassLevelAnnotationsDefaultMethodAction.java  |   2 -
 .../convention/actions/action/ClassNameAction.java |   2 -
 .../actions/action/SingleActionNameAction.java     |   2 -
 .../convention/actions/action/TestAction.java      |   2 -
 .../convention/actions/action/TestBase.java        |   2 -
 .../convention/actions/action/TestExtends.java     |   2 -
 .../ClassLevelAllowedMethodsAction.java            |  18 ++
 .../PackageLevelAllowedMethodsAction.java          |  18 ++
 .../actions/allowedmethods/package-info.java       |   2 -
 .../sub/PackageLevelAllowedMethodsChildAction.java |  18 ++
 .../convention/actions/chain/ChainedAction.java    |   2 -
 .../SingleActionNameAction2.java                   |   2 -
 .../actions/defaultinterceptor/package-info.java   |   2 -
 .../exception/ExceptionsActionLevelAction.java     |   2 -
 .../exception/ExceptionsMethodLevelAction.java     |   2 -
 .../convention/actions/exclude/ExcludeAction.java  |   2 -
 .../struts2/convention/actions/idx/Index.java      |   2 -
 .../struts2/convention/actions/idx/idx2/Index.java |   2 -
 .../interceptor/ActionLevelInterceptor2Action.java |   2 -
 .../interceptor/ActionLevelInterceptor3Action.java |   2 -
 .../interceptor/ActionLevelInterceptorAction.java  |   2 -
 .../actions/interceptor/InterceptorsAction.java    |   2 -
 .../namespace/ActionLevelNamespaceAction.java      |   2 -
 .../namespace/ClassLevelNamespaceAction.java       |   2 -
 .../namespace/PackageLevelNamespaceAction.java     |   2 -
 .../convention/actions/namespace/package-info.java |   2 -
 .../actions/namespace2/DefaultNamespaceAction.java |   2 -
 .../namespace3/ActionLevelNamespacesAction.java    |   2 -
 .../ActionAndPackageLevelNamespacesAction.java     |   2 -
 .../actions/namespace4/package-info.java           |   2 -
 .../params/ActionParamsMethodLevelAction.java      |   2 -
 .../ClassLevelParentPackageAction.java             |   2 -
 .../PackageLevelParentPackageAction.java           |   2 -
 .../actions/parentpackage/package-info.java        |   2 -
 .../sub/ClassLevelParentPackageChildAction.java    |   2 -
 .../sub/PackageLevelParentPackageChildAction.java  |   2 -
 .../actions/result/ActionLevelResultAction.java    |   2 -
 .../actions/result/ActionLevelResultsAction.java   |   2 -
 .../result/ActionLevelResultsNamesAction.java      |   2 -
 .../actions/result/ClassLevelResultAction.java     |   2 -
 .../actions/result/ClassLevelResultsAction.java    |   2 -
 .../actions/result/GlobalResultAction.java         |  18 ++
 .../actions/result/GlobalResultOverrideAction.java |  18 ++
 .../actions/result/InheritedResultExtends.java     |   2 -
 .../actions/result/InheritedResultTestBase.java    |   2 -
 .../actions/result/InheritedResultsExtends.java    |   2 -
 .../actions/result/InheritedResultsTestBase.java   |   2 -
 .../result/OverrideInheritedResultExtends.java     |   2 -
 .../result/OverrideInheritedResultTestBase.java    |   2 -
 .../actions/result/OverrideResultAction.java       |   2 -
 .../resultpath/ClassLevelResultPathAction.java     |   2 -
 .../resultpath/PackageLevelResultPathAction.java   |   2 -
 .../actions/resultpath/package-info.java           |   2 -
 .../struts2/convention/actions/skip/Index.java     |   2 -
 .../actions/transactions/TransNameAction.java      |   2 -
 .../convention/dontfind/DontFindMeAction.java      |   2 -
 .../WEB-INF/component/no-annotation-foo.ftl        |  20 ++
 .../resources/WEB-INF/component/no-annotation.ftl  |  20 ++
 plugins/dwr/pom.xml                                |   2 -
 .../apache/struts2/validators/DWRValidator.java    |   3 -
 plugins/embeddedjsp/pom.xml                        |  12 +-
 .../java/org/apache/struts2/EmbeddedJSPResult.java |   2 -
 .../main/java/org/apache/struts2/JSPLoader.java    |   2 -
 .../main/java/org/apache/struts2/JSPRuntime.java   |   2 -
 .../java/org/apache/struts2/JSPServletConfig.java  |   2 -
 .../main/java/org/apache/struts2/ServletCache.java |   2 -
 .../apache/struts2/compiler/MemoryClassLoader.java |   4 +-
 .../struts2/compiler/MemoryJavaFileObject.java     |   2 -
 .../apache/struts2/el/ExpressionFactoryImpl.java   |  32 +-
 .../apache/struts2/el/MethodExpressionImpl.java    |  32 +-
 .../apache/struts2/el/MethodExpressionLiteral.java |  32 +-
 .../org/apache/struts2/el/ValueExpressionImpl.java |  32 +-
 .../apache/struts2/el/ValueExpressionLiteral.java  |  32 +-
 .../org/apache/struts2/el/lang/ELArithmetic.java   |  27 +-
 .../java/org/apache/struts2/el/lang/ELSupport.java |  31 +-
 .../apache/struts2/el/lang/EvaluationContext.java  |  31 +-
 .../apache/struts2/el/lang/ExpressionBuilder.java  |  27 +-
 .../struts2/el/lang/FunctionMapperFactory.java     |  31 +-
 .../apache/struts2/el/lang/FunctionMapperImpl.java |  31 +-
 .../struts2/el/lang/VariableMapperFactory.java     |  31 +-
 .../apache/struts2/el/lang/VariableMapperImpl.java |  31 +-
 .../apache/struts2/el/parser/ArithmeticNode.java   |  31 +-
 .../java/org/apache/struts2/el/parser/AstAnd.java  |  28 +-
 .../apache/struts2/el/parser/AstBracketSuffix.java |  28 +-
 .../org/apache/struts2/el/parser/AstChoice.java    |  28 +-
 .../struts2/el/parser/AstCompositeExpression.java  |  28 +-
 .../struts2/el/parser/AstDeferredExpression.java   |  28 +-
 .../java/org/apache/struts2/el/parser/AstDiv.java  |  28 +-
 .../org/apache/struts2/el/parser/AstDotSuffix.java |  28 +-
 .../struts2/el/parser/AstDynamicExpression.java    |  28 +-
 .../org/apache/struts2/el/parser/AstEmpty.java     |  28 +-
 .../org/apache/struts2/el/parser/AstEqual.java     |  28 +-
 .../org/apache/struts2/el/parser/AstFalse.java     |  28 +-
 .../apache/struts2/el/parser/AstFloatingPoint.java |  28 +-
 .../org/apache/struts2/el/parser/AstFunction.java  |  28 +-
 .../apache/struts2/el/parser/AstGreaterThan.java   |  28 +-
 .../struts2/el/parser/AstGreaterThanEqual.java     |  28 +-
 .../apache/struts2/el/parser/AstIdentifier.java    |  28 +-
 .../org/apache/struts2/el/parser/AstInteger.java   |  28 +-
 .../org/apache/struts2/el/parser/AstLessThan.java  |  29 +-
 .../apache/struts2/el/parser/AstLessThanEqual.java |  29 +-
 .../struts2/el/parser/AstLiteralExpression.java    |  29 +-
 .../org/apache/struts2/el/parser/AstMinus.java     |  29 +-
 .../java/org/apache/struts2/el/parser/AstMod.java  |  29 +-
 .../java/org/apache/struts2/el/parser/AstMult.java |  29 +-
 .../org/apache/struts2/el/parser/AstNegative.java  |  29 +-
 .../java/org/apache/struts2/el/parser/AstNot.java  |  29 +-
 .../org/apache/struts2/el/parser/AstNotEqual.java  |  29 +-
 .../java/org/apache/struts2/el/parser/AstNull.java |  29 +-
 .../java/org/apache/struts2/el/parser/AstOr.java   |  29 +-
 .../java/org/apache/struts2/el/parser/AstPlus.java |  29 +-
 .../org/apache/struts2/el/parser/AstString.java    |  29 +-
 .../java/org/apache/struts2/el/parser/AstTrue.java |  29 +-
 .../org/apache/struts2/el/parser/AstValue.java     |  29 +-
 .../org/apache/struts2/el/parser/BooleanNode.java  |  31 +-
 .../org/apache/struts2/el/parser/ELParser.java     |  18 ++
 .../struts2/el/parser/ELParserConstants.java       |  18 ++
 .../struts2/el/parser/ELParserTokenManager.java    |  18 ++
 .../struts2/el/parser/ELParserTreeConstants.java   |  18 ++
 .../apache/struts2/el/parser/JJTELParserState.java |  18 ++
 .../java/org/apache/struts2/el/parser/Node.java    |  34 +-
 .../org/apache/struts2/el/parser/NodeVisitor.java  |  30 +-
 .../apache/struts2/el/parser/ParseException.java   |  20 +-
 .../apache/struts2/el/parser/SimpleCharStream.java |  20 +-
 .../org/apache/struts2/el/parser/SimpleNode.java   |  29 +-
 .../java/org/apache/struts2/el/parser/Token.java   |  20 +-
 .../apache/struts2/el/parser/TokenMgrError.java    |  20 +-
 .../apache/struts2/el/util/ConcurrentCache.java    |  26 +-
 .../org/apache/struts2/el/util/MessageFactory.java |  30 +-
 .../org/apache/struts2/el/util/ReflectionUtil.java |  31 +-
 .../java/org/apache/struts2/jasper/Constants.java  |  32 +-
 .../org/apache/struts2/jasper/CustomCompiler.java  |   2 -
 .../struts2/jasper/EmbeddedServletOptions.java     |  31 +-
 .../org/apache/struts2/jasper/JasperException.java |  31 +-
 .../main/java/org/apache/struts2/jasper/JspC.java  |  27 +-
 .../struts2/jasper/JspCompilationContext.java      |  31 +-
 .../java/org/apache/struts2/jasper/Options.java    |  31 +-
 .../struts2/jasper/compiler/BeanRepository.java    |  31 +-
 .../apache/struts2/jasper/compiler/Collector.java  |  27 +-
 .../apache/struts2/jasper/compiler/Compiler.java   |  31 +-
 .../jasper/compiler/DefaultErrorHandler.java       |  31 +-
 .../org/apache/struts2/jasper/compiler/Dumper.java |  31 +-
 .../struts2/jasper/compiler/ELFunctionMapper.java  |  31 +-
 .../org/apache/struts2/jasper/compiler/ELNode.java |  31 +-
 .../apache/struts2/jasper/compiler/ELParser.java   |  31 +-
 .../struts2/jasper/compiler/ErrorDispatcher.java   |  30 +-
 .../struts2/jasper/compiler/ErrorHandler.java      |  31 +-
 .../apache/struts2/jasper/compiler/Generator.java  |  27 +-
 .../jasper/compiler/ImplicitTagLibraryInfo.java    |  31 +-
 .../struts2/jasper/compiler/JasperTagInfo.java     |  31 +-
 .../struts2/jasper/compiler/JavacErrorDetail.java  |  31 +-
 .../apache/struts2/jasper/compiler/JspConfig.java  |  31 +-
 .../struts2/jasper/compiler/JspDocumentParser.java |  30 +-
 .../apache/struts2/jasper/compiler/JspReader.java  |  31 +-
 .../struts2/jasper/compiler/JspRuntimeContext.java |  31 +-
 .../apache/struts2/jasper/compiler/JspUtil.java    |  31 +-
 .../apache/struts2/jasper/compiler/Localizer.java  |  31 +-
 .../org/apache/struts2/jasper/compiler/Mark.java   |  30 +-
 .../org/apache/struts2/jasper/compiler/Node.java   |  31 +-
 .../struts2/jasper/compiler/PageDataImpl.java      |  30 +-
 .../apache/struts2/jasper/compiler/PageInfo.java   |  26 +-
 .../org/apache/struts2/jasper/compiler/Parser.java |  30 +-
 .../struts2/jasper/compiler/ParserController.java  |  31 +-
 .../jasper/compiler/ScriptingVariabler.java        |  31 +-
 .../struts2/jasper/compiler/ServletWriter.java     |  30 +-
 .../struts2/jasper/compiler/SmapGenerator.java     |  31 +-
 .../struts2/jasper/compiler/SmapStratum.java       |  31 +-
 .../apache/struts2/jasper/compiler/SmapUtil.java   |  31 +-
 .../struts2/jasper/compiler/TagConstants.java      |  31 +-
 .../struts2/jasper/compiler/TagFileProcessor.java  |  31 +-
 .../jasper/compiler/TagLibraryInfoImpl.java        |  31 +-
 .../struts2/jasper/compiler/TagPluginManager.java  |  31 +-
 .../struts2/jasper/compiler/TextOptimizer.java     |  30 +-
 .../struts2/jasper/compiler/TldLocationsCache.java |  31 +-
 .../apache/struts2/jasper/compiler/Validator.java  |  31 +-
 .../jasper/compiler/tagplugin/TagPlugin.java       |  31 +-
 .../compiler/tagplugin/TagPluginContext.java       |  32 +-
 .../apache/struts2/jasper/el/ELContextImpl.java    |  30 +-
 .../apache/struts2/jasper/el/ELContextWrapper.java |  30 +-
 .../apache/struts2/jasper/el/ELResolverImpl.java   |  31 +-
 .../struts2/jasper/el/ExpressionEvaluatorImpl.java |  31 +-
 .../apache/struts2/jasper/el/ExpressionImpl.java   |  30 +-
 .../struts2/jasper/el/FunctionMapperImpl.java      |  30 +-
 .../apache/struts2/jasper/el/JspELException.java   |  30 +-
 .../struts2/jasper/el/JspMethodExpression.java     |  30 +-
 .../jasper/el/JspMethodNotFoundException.java      |  30 +-
 .../jasper/el/JspPropertyNotFoundException.java    |  30 +-
 .../jasper/el/JspPropertyNotWritableException.java |  30 +-
 .../struts2/jasper/el/JspValueExpression.java      |  30 +-
 .../struts2/jasper/el/VariableResolverImpl.java    |  30 +-
 .../struts2/jasper/runtime/AnnotationHelper.java   |  31 +-
 .../struts2/jasper/runtime/BodyContentImpl.java    |  31 +-
 .../apache/struts2/jasper/runtime/HttpJspBase.java |  31 +-
 .../jasper/runtime/JspApplicationContextImpl.java  |  30 +-
 .../struts2/jasper/runtime/JspContextWrapper.java  |  31 +-
 .../struts2/jasper/runtime/JspFactoryImpl.java     |  30 +-
 .../struts2/jasper/runtime/JspFragmentHelper.java  |  31 +-
 .../struts2/jasper/runtime/JspRuntimeLibrary.java  |  31 +-
 .../struts2/jasper/runtime/JspSourceDependent.java |  31 +-
 .../struts2/jasper/runtime/JspWriterImpl.java      |  31 +-
 .../struts2/jasper/runtime/PageContextImpl.java    |  31 +-
 .../jasper/runtime/PerThreadTagHandlerPool.java    |  31 +-
 .../jasper/runtime/ProtectedFunctionMapper.java    |  31 +-
 .../runtime/ServletResponseWrapperInclude.java     |  31 +-
 .../struts2/jasper/runtime/TagHandlerPool.java     |  31 +-
 .../struts2/jasper/security/SecurityClassLoad.java |  32 +-
 .../struts2/jasper/security/SecurityUtil.java      |  30 +-
 .../struts2/jasper/servlet/JasperLoader.java       |  31 +-
 .../struts2/jasper/servlet/JspCServletContext.java |  31 +-
 .../apache/struts2/jasper/servlet/JspServlet.java  |  31 +-
 .../struts2/jasper/servlet/JspServletWrapper.java  |  31 +-
 .../struts2/jasper/servlet/mbeans-descriptors.xml  |  36 ---
 .../struts2/jasper/tagplugins/jstl/Util.java       |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/Catch.java |  32 +-
 .../jasper/tagplugins/jstl/core/Choose.java        |  32 +-
 .../jasper/tagplugins/jstl/core/ForEach.java       |  32 +-
 .../jasper/tagplugins/jstl/core/ForTokens.java     |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/If.java    |  32 +-
 .../jasper/tagplugins/jstl/core/Import.java        |  32 +-
 .../jasper/tagplugins/jstl/core/Otherwise.java     |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/Out.java   |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/Param.java |  32 +-
 .../jasper/tagplugins/jstl/core/Redirect.java      |  32 +-
 .../jasper/tagplugins/jstl/core/Remove.java        |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/Set.java   |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/Url.java   |  32 +-
 .../struts2/jasper/tagplugins/jstl/core/When.java  |  32 +-
 .../org/apache/struts2/jasper/util/Enumerator.java |  34 +-
 .../struts2/jasper/xmlparser/ASCIIReader.java      |  31 +-
 .../struts2/jasper/xmlparser/EncodingMap.java      |  37 +--
 .../struts2/jasper/xmlparser/ParserUtils.java      |  31 +-
 .../struts2/jasper/xmlparser/SymbolTable.java      |  37 +--
 .../apache/struts2/jasper/xmlparser/TreeNode.java  |  32 +-
 .../apache/struts2/jasper/xmlparser/UCSReader.java |  31 +-
 .../struts2/jasper/xmlparser/UTF8Reader.java       |  31 +-
 .../apache/struts2/jasper/xmlparser/XMLChar.java   |  37 +--
 .../jasper/xmlparser/XMLEncodingDetector.java      |  37 +--
 .../apache/struts2/jasper/xmlparser/XMLString.java |  37 +--
 .../struts2/jasper/xmlparser/XMLStringBuffer.java  |  37 +--
 .../org/apache/struts2/el/Messages.properties      |  29 +-
 .../org/apache/struts2/el/Messages_es.properties   |  29 +-
 .../jasper/resources/LocalStrings.properties       |  30 +-
 .../jasper/resources/LocalStrings_es.properties    | 356 ++++++++++-----------
 .../jasper/resources/LocalStrings_fr.properties    | 320 +++++++++---------
 .../jasper/resources/LocalStrings_ja.properties    |  30 +-
 .../struts2/jasper/servlet/mbeans-descriptors.xml} |  30 +-
 .../struts2/jasper/tagplugins/jstl/tagPlugins.xml  |  32 +-
 .../src/main/resources/struts-plugin.xml           |   2 -
 .../org/apache/struts2/EmbeddedJSPResultTest.java  |   6 +-
 .../test/resources/org/apache/struts2/beans.jsp    |  20 ++
 .../test/resources/org/apache/struts2/broken0.jsp  |  20 ++
 .../test/resources/org/apache/struts2/dont-use.jsp |  20 ++
 .../src/test/resources/org/apache/struts2/el.jsp   |  20 ++
 .../resources/org/apache/struts2/includes0.jsp     |  20 ++
 .../resources/org/apache/struts2/includes1.jsp     |  20 ++
 .../resources/org/apache/struts2/includes2.jsp     |  20 ++
 .../resources/org/apache/struts2/includes3.jsp     |  20 ++
 .../src/test/resources/org/apache/struts2/jstl.jsp |  20 ++
 .../resources/org/apache/struts2/printParam.jsp    |  20 ++
 .../resources/org/apache/struts2/scriptlet.jsp     |  20 ++
 .../test/resources/org/apache/struts2/simple0.jsp  |  20 ++
 .../resources/org/apache/struts2/sub/simple0.jsp   |  20 ++
 .../src/test/resources/org/apache/struts2/tag0.jsp |  20 ++
 plugins/gxp/pom.xml                                |  20 ++
 .../org/apache/struts2/views/gxp/AbstractGxp.java  |   2 -
 .../struts2/views/gxp/AbstractGxpResult.java       |   2 -
 .../java/org/apache/struts2/views/gxp/Gxp.java     |   2 -
 .../org/apache/struts2/views/gxp/GxpInstance.java  |   2 -
 .../org/apache/struts2/views/gxp/GxpResult.java    |   2 -
 .../java/org/apache/struts2/views/gxp/Param.java   |   2 -
 plugins/gxp/src/main/resources/struts-plugin.xml   |  21 +-
 plugins/jasperreports/pom.xml                      |   2 -
 .../struts2/views/jasperreports/CompileReport.java |   3 -
 .../views/jasperreports/JasperReportConstants.java |   3 -
 .../views/jasperreports/JasperReportsResult.java   |   3 -
 .../views/jasperreports/ValueStackDataSource.java  |   3 -
 .../views/jasperreports/ValueStackShadowMap.java   |   3 -
 .../struts2/views/jasperreports/package.html       |   2 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 plugins/javatemplates/pom.xml                      |  38 +--
 .../org/apache/struts2/views/java/Attributes.java  |   2 -
 .../views/java/DefaultTagHandlerFactory.java       |   2 -
 .../apache/struts2/views/java/DefaultTheme.java    |   3 -
 .../struts2/views/java/JavaTemplateEngine.java     |   2 -
 .../apache/struts2/views/java/TagGenerator.java    |   2 -
 .../org/apache/struts2/views/java/TagHandler.java  |   2 -
 .../struts2/views/java/TagHandlerFactory.java      |   2 -
 .../apache/struts2/views/java/TagSerializer.java   |   2 -
 .../java/org/apache/struts2/views/java/Theme.java  |   2 -
 .../struts2/views/java/XHTMLTagSerializer.java     |   2 -
 .../java/simple/AbstractMessageListHandler.java    |   2 -
 .../views/java/simple/AbstractTagHandler.java      |   2 -
 .../views/java/simple/ActionErrorHandler.java      |   2 -
 .../views/java/simple/ActionMessageHandler.java    |   3 -
 .../struts2/views/java/simple/AnchorHandler.java   |   2 -
 .../struts2/views/java/simple/CheckboxHandler.java |   3 -
 .../views/java/simple/CheckboxListHandler.java     |   3 -
 .../views/java/simple/CommonAttributesHandler.java |   2 -
 .../views/java/simple/DateTextFieldHandler.java    |  18 ++
 .../java/simple/DynamicAttributesHandler.java      |   3 -
 .../struts2/views/java/simple/EmptyHandler.java    |   2 -
 .../views/java/simple/FieldErrorHandler.java       |   2 -
 .../struts2/views/java/simple/FileHandler.java     |   2 -
 .../struts2/views/java/simple/FormHandler.java     |   2 -
 .../struts2/views/java/simple/HeadHandler.java     |   3 -
 .../struts2/views/java/simple/HiddenHandler.java   |   2 -
 .../struts2/views/java/simple/LabelHandler.java    |   2 -
 .../struts2/views/java/simple/PasswordHandler.java |   2 -
 .../struts2/views/java/simple/RadioHandler.java    |   3 -
 .../struts2/views/java/simple/ResetHandler.java    |   2 -
 .../views/java/simple/ScriptingEventsHandler.java  |   2 -
 .../struts2/views/java/simple/SelectHandler.java   |   2 -
 .../struts2/views/java/simple/SimpleTheme.java     |   2 -
 .../struts2/views/java/simple/SubmitHandler.java   |   2 -
 .../struts2/views/java/simple/TextAreaHandler.java |   2 -
 .../views/java/simple/TextFieldHandler.java        |   2 -
 .../struts2/views/java/simple/TokenHandler.java    |   2 -
 .../src/main/resources/struts-plugin.xml           |  40 ++-
 .../views/java/simple/DateTextFieldTest.java       |  20 ++
 plugins/jfreechart/pom.xml                         |   2 -
 .../org/apache/struts2/dispatcher/ChartResult.java |   3 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 .../apache/struts2/dispatcher/ChartResultTest.java |   3 -
 plugins/json/pom.xml                               |   2 -
 .../struts2/json/JSONActionRedirectResult.java     |  18 ++
 .../java/org/apache/struts2/json/JSONCleaner.java  |   2 -
 .../org/apache/struts2/json/JSONConstants.java     |  25 +-
 .../org/apache/struts2/json/JSONException.java     |   2 -
 .../org/apache/struts2/json/JSONInterceptor.java   |   2 -
 .../org/apache/struts2/json/JSONPopulator.java     |   2 -
 .../java/org/apache/struts2/json/JSONReader.java   |   2 -
 .../java/org/apache/struts2/json/JSONResult.java   |   2 -
 .../java/org/apache/struts2/json/JSONUtil.java     |   2 -
 .../struts2/json/JSONValidationInterceptor.java    |   3 -
 .../java/org/apache/struts2/json/JSONWriter.java   |  25 +-
 .../apache/struts2/json/SerializationParams.java   |   2 -
 .../org/apache/struts2/json/annotations/JSON.java  |   2 -
 .../struts2/json/annotations/JSONFieldBridge.java  |   3 -
 .../struts2/json/annotations/JSONParameter.java    |   3 -
 .../org/apache/struts2/json/annotations/SMD.java   |   2 -
 .../apache/struts2/json/annotations/SMDMethod.java |   2 -
 .../json/annotations/SMDMethodParameter.java       |   2 -
 .../apache/struts2/json/bridge/FieldBridge.java    |   3 -
 .../struts2/json/bridge/ParameterizedBridge.java   |   3 -
 .../apache/struts2/json/bridge/StringBridge.java   |   3 -
 .../java/org/apache/struts2/json/rpc/RPCError.java |   2 -
 .../org/apache/struts2/json/rpc/RPCErrorCode.java  |   2 -
 .../org/apache/struts2/json/rpc/RPCResponse.java   |   2 -
 .../main/java/org/apache/struts2/json/smd/SMD.java |   2 -
 .../org/apache/struts2/json/smd/SMDGenerator.java  |  18 ++
 .../org/apache/struts2/json/smd/SMDMethod.java     |   2 -
 .../struts2/json/smd/SMDMethodParameter.java       |   2 -
 .../main/resources/META-INF/tags/JsonPlugin.tld    |  20 ++
 plugins/json/src/main/resources/struts-plugin.xml  |  21 +-
 .../test/java/org/apache/struts2/json/AnEnum.java  |   2 -
 .../java/org/apache/struts2/json/AnEnumBean.java   |   2 -
 .../java/org/apache/struts2/json/AnotherBean.java  |  18 ++
 .../test/java/org/apache/struts2/json/Bean.java    |   2 -
 .../apache/struts2/json/DefaultJSONWriterTest.java |  18 ++
 .../struts2/json/JSONActionRedirectResultTest.java |  18 ++
 .../org/apache/struts2/json/JSONCleanerTest.java   |  27 +-
 .../java/org/apache/struts2/json/JSONEnumTest.java |   2 -
 .../apache/struts2/json/JSONInterceptorTest.java   |   2 -
 .../org/apache/struts2/json/JSONPopulatorTest.java |   2 -
 .../org/apache/struts2/json/JSONReaderTest.java    |  18 ++
 .../org/apache/struts2/json/JSONResultTest.java    |   2 -
 .../java/org/apache/struts2/json/JSONUtilTest.java |   2 -
 .../json/JSONValidationInterceptorTest.java        |   3 -
 .../java/org/apache/struts2/json/ListBean.java     |  18 ++
 .../java/org/apache/struts2/json/OtherBean.java    |   2 -
 .../org/apache/struts2/json/SMDActionTest1.java    |   2 -
 .../org/apache/struts2/json/SMDActionTest2.java    |   2 -
 .../struts2/json/SMDMethodInterfaceTest.java       |   2 -
 .../java/org/apache/struts2/json/SimpleValue.java  |   2 -
 .../org/apache/struts2/json/SingleDateBean.java    |  18 ++
 .../struts2/json/StrutsMockHttpServletRequest.java |   1 -
 .../json/StrutsMockHttpServletResponse.java        |  18 ++
 .../apache/struts2/json/StrutsMockHttpSession.java |   1 -
 .../struts2/json/StrutsMockServletContext.java     |   1 -
 .../java/org/apache/struts2/json/TestAction.java   |   2 -
 .../java/org/apache/struts2/json/TestAction2.java  |   2 -
 .../java/org/apache/struts2/json/TestAction3.java  |   2 -
 .../java/org/apache/struts2/json/TestAction4.java  |   2 -
 .../java/org/apache/struts2/json/TestAction5.java  |   2 -
 .../java/org/apache/struts2/json/TestUtils.java    |   2 -
 .../org/apache/struts2/json/WrapperClassBean.java  |   2 -
 plugins/junit/pom.xml                              |   2 -
 .../struts2/ConventionPluginResourceLoader.java    |  18 ++
 .../org/apache/struts2/StrutsJUnit4TestCase.java   |   3 -
 .../org/apache/struts2/StrutsRestTestCase.java     |  18 ++
 .../apache/struts2/StrutsSpringJUnit4TestCase.java |   3 -
 .../org/apache/struts2/StrutsSpringTestCase.java   |   2 -
 .../java/org/apache/struts2/StrutsTestCase.java    |   3 -
 .../junit/src/test/java/actions/ViewAction.java    |   2 -
 .../java/org/apache/struts2/JUnitTestAction.java   |   2 -
 .../java/org/apache/struts2/MySessionBean.java     |   2 -
 .../apache/struts2/StrutsJUnit4TestCaseTest.java   |   3 -
 .../struts2/StrutsSpringJUnit4TestCaseTest.java    |   2 -
 .../apache/struts2/StrutsSpringTestCaseTest.java   |   2 -
 .../org/apache/struts2/StrutsTestCaseTest.java     |   2 -
 .../StrutsJUnit4ConventionTestCaseTest.java        |   2 -
 .../apache/struts2/session/SessionGetAction.java   |   2 -
 .../apache/struts2/session/SessionSetAction.java   |   2 -
 .../session/StrutsJUnit4SessionTestCaseTest.java   |   3 -
 .../src/test/resources/applicationContext.xml      |  38 +--
 .../resources/struts-convention-configuration.xml  |   2 -
 .../test/resources/struts-session-values-test.xml  |   1 -
 plugins/junit/src/test/resources/struts-test.xml   |  40 ++-
 plugins/junit/src/test/resources/struts.xml        |  38 +--
 plugins/osgi/pom.xml                               |  20 ++
 .../org/apache/struts2/osgi/BundleAccessor.java    |   3 -
 .../struts2/osgi/BundleClassLoaderInterface.java   |   3 -
 .../struts2/osgi/BundleFreemarkerManager.java      |   3 -
 .../apache/struts2/osgi/BundlePackageLoader.java   |   3 -
 .../apache/struts2/osgi/DefaultBundleAccessor.java |   3 -
 .../struts2/osgi/DelegatingObjectFactory.java      |   3 -
 .../struts2/osgi/OsgiConfigurationProvider.java    |   3 -
 .../org/apache/struts2/osgi/OsgiHostFactory.java   |   2 -
 .../java/org/apache/struts2/osgi/OsgiUtil.java     |   3 -
 .../org/apache/struts2/osgi/PackageLoader.java     |   3 -
 .../struts2/osgi/SpringOsgiObjectFactory.java      |   3 -
 .../apache/struts2/osgi/StrutsOsgiListener.java    |  18 ++
 .../org/apache/struts2/osgi/host/BaseOsgiHost.java |   2 -
 .../apache/struts2/osgi/host/FelixOsgiHost.java    |   3 -
 .../struts2/osgi/host/GlassfishOSGiHost.java       |   2 -
 .../org/apache/struts2/osgi/host/OsgiHost.java     |   5 -
 .../osgi/interceptor/BundleContextAware.java       |   2 -
 .../struts2/osgi/interceptor/OsgiInterceptor.java  |   2 -
 .../struts2/osgi/interceptor/ServiceAware.java     |   2 -
 .../loaders/FreeMarkerBundleResourceLoader.java    |   3 -
 .../loaders/StaticContentBundleResourceLoader.java |   3 -
 .../osgi/loaders/VelocityBundleResourceLoader.java |   3 -
 plugins/osgi/src/main/resources/beanRefContext.xml |  20 ++
 .../osgi/src/main/resources/struts-osgi.properties |   5 +-
 plugins/osgi/src/main/resources/struts-plugin.xml  |  21 +-
 .../struts2/osgi/host/FelixOsgiHostTest.java       |   2 -
 .../osgi/interceptor/OsgiInterceptorTest.java      |  18 ++
 .../struts2/osgi/interceptor/SomeAction.java       |   2 -
 plugins/oval/pom.xml                               |   2 -
 .../apache/struts2/oval/annotation/Profiles.java   |   2 -
 .../interceptor/DefaultOValValidationManager.java  |  18 ++
 .../interceptor/OValValidationInterceptor.java     |   2 -
 .../oval/interceptor/OValValidationManager.java    |  20 +-
 plugins/oval/src/main/resources/struts-plugin.xml  |   2 -
 .../DummyDefaultOValValidationManager.java         |   2 -
 .../oval/interceptor/FieldsWithProfiles.java       |   2 -
 .../struts2/oval/interceptor/MemberObject.java     |  18 ++
 .../oval/interceptor/ModelDrivenAction.java        |  18 ++
 .../interceptor/OValValidationInterceptorTest.java |   2 -
 .../struts2/oval/interceptor/SimpleField.java      |   2 -
 .../struts2/oval/interceptor/SimpleFieldI18n.java  |   2 -
 .../interceptor/SimpleFieldI18nDefaultKey.java     |   2 -
 .../interceptor/SimpleFieldJPAAnnotations.java     |   2 -
 .../interceptor/SimpleFieldOGNLExpression.java     |   5 -
 .../struts2/oval/interceptor/SimpleFieldsXML.java  |  18 ++
 .../oval/interceptor/SimpleFieldsXMLChild.java     |   2 -
 .../struts2/oval/interceptor/SimpleMethod.java     |   2 -
 .../oval/interceptor/ValidationInMethods.java      |   2 -
 .../struts2/oval/interceptor/VoidResult.java       |   2 -
 .../struts2/oval/interceptor/domain/Address.java   |  18 ++
 .../struts2/oval/interceptor/domain/Person.java    |  18 ++
 .../oval/interceptor/SimpleFieldI18n.properties    |  18 ++
 .../interceptor/SimpleFieldsXML-validation.xml     |  20 ++
 .../SimpleFieldsXMLChild-validation.xml            |  20 ++
 plugins/oval/src/test/resources/oval-test.xml      |  20 ++
 plugins/pell-multipart/pom.xml                     |   2 -
 .../dispatcher/multipart/PellMultiPartRequest.java |   4 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 plugins/plexus/pom.xml                             |   2 -
 .../org/apache/struts2/plexus/PlexusFilter.java    |   3 -
 .../struts2/plexus/PlexusLifecycleListener.java    |   3 -
 .../apache/struts2/plexus/PlexusObjectFactory.java |   3 -
 .../apache/struts2/plexus/PlexusThreadLocal.java   |   3 -
 .../org/apache/struts2/plexus/PlexusUtils.java     |   3 -
 .../plexus/src/main/resources/struts-plugin.xml    |   2 -
 plugins/pom.xml                                    |   2 -
 plugins/portlet-tiles/pom.xml                      |   2 -
 .../struts2/views/tiles/PortletTilesResult.java    |   3 -
 .../src/main/resources/struts-plugin.xml           |   2 -
 plugins/portlet/pom.xml                            |  20 ++
 .../org/apache/struts2/StrutsPortletTestCase.java  |  18 ++
 .../struts2/components/PortletUrlRenderer.java     |   2 -
 .../struts2/portlet/PortletApplicationMap.java     |   2 -
 .../apache/struts2/portlet/PortletConstants.java   |  18 ++
 .../org/apache/struts2/portlet/PortletPhase.java   |  18 ++
 .../apache/struts2/portlet/PortletRequestMap.java  |   2 -
 .../apache/struts2/portlet/PortletSessionMap.java  |   2 -
 .../portlet/context/PortletActionContext.java      |   3 -
 .../dispatcher/DirectRenderFromEventAction.java    |   2 -
 .../portlet/dispatcher/DispatcherServlet.java      |   2 -
 .../portlet/dispatcher/Jsr168Dispatcher.java       |   3 -
 .../portlet/dispatcher/Jsr286Dispatcher.java       |  18 ++
 .../interceptor/PortletAwareInterceptor.java       |   2 -
 .../portlet/interceptor/PortletContextAware.java   |   2 -
 .../interceptor/PortletPreferencesAware.java       |   2 -
 .../portlet/interceptor/PortletPrincipalProxy.java |   2 -
 .../portlet/interceptor/PortletRequestAware.java   |   2 -
 .../portlet/interceptor/PortletResponseAware.java  |   2 -
 .../interceptor/PortletStateInterceptor.java       |   2 -
 .../interceptor/ServletPortletPreferences.java     |   2 -
 .../result/PortletActionRedirectResult.java        |   2 -
 .../struts2/portlet/result/PortletResult.java      |   2 -
 .../portlet/result/PortletResultHelper.java        |  18 ++
 .../portlet/result/PortletResultHelperJSR168.java  |  18 ++
 .../portlet/result/PortletResultHelperJSR286.java  |  18 ++
 .../portlet/result/PortletVelocityResult.java      |   2 -
 .../portlet/servlet/PortletHttpSession.java        |   2 -
 .../portlet/servlet/PortletServletConfig.java      |   2 -
 .../portlet/servlet/PortletServletContext.java     |   2 -
 .../portlet/servlet/PortletServletInputStream.java |   2 -
 .../servlet/PortletServletOutputStream.java        |   2 -
 .../portlet/servlet/PortletServletRequest.java     |   2 -
 .../servlet/PortletServletRequestDispatcher.java   |   2 -
 .../portlet/servlet/PortletServletResponse.java    |   2 -
 .../servlet/PortletServletResponseJSR286.java      |  18 ++
 .../apache/struts2/portlet/servlet/package.html    |   2 -
 .../struts2/portlet/util/PortletUrlHelper.java     |   2 -
 .../portlet/util/PortletUrlHelperJSR286.java       |  18 ++
 .../views/freemarker/PortletFreemarkerResult.java  |   2 -
 .../portlet/src/main/resources/struts-plugin.xml   |   2 -
 .../apache/struts2/components/PortletAction.java   |  18 ++
 .../struts2/components/PortletUrlRendererTest.java |  18 ++
 .../struts2/portlet/PortletApplicationMapTest.java |   2 -
 .../struts2/portlet/PortletRequestMapTest.java     |   2 -
 .../struts2/portlet/PortletSessionMapTest.java     |   2 -
 .../portlet/context/PortletActionContextTest.java  |   2 -
 .../portlet/dispatcher/Jsr168DispatcherTest.java   |   2 -
 .../portlet/dispatcher/Jsr286DispatcherTest.java   |   2 -
 .../interceptor/PortletAwareInterceptorTest.java   |   2 -
 .../interceptor/PortletStateInterceptorTest.java   |   2 -
 .../struts2/portlet/result/PortletResultTest.java  |   2 -
 .../struts2/portlet/util/PortletUrlHelperTest.java |   2 -
 .../struts2/views/jsp/PortletUrlTagTest.java       |   2 -
 plugins/portlet/src/test/resources/log4j2.xml      |  20 ++
 plugins/portlet/src/test/resources/struts.xml      |  20 ++
 plugins/rest/pom.xml                               |   2 -
 .../struts2/rest/ContentTypeHandlerManager.java    |   3 -
 .../struts2/rest/ContentTypeInterceptor.java       |   3 -
 .../rest/DefaultContentTypeHandlerManager.java     |   3 -
 .../apache/struts2/rest/DefaultHttpHeaders.java    |   3 -
 .../java/org/apache/struts2/rest/HttpHeaders.java  |   3 -
 .../apache/struts2/rest/RestActionInvocation.java  |   3 -
 .../org/apache/struts2/rest/RestActionMapper.java  |   3 -
 .../struts2/rest/RestActionProxyFactory.java       |   3 -
 .../org/apache/struts2/rest/RestActionSupport.java |   3 -
 .../struts2/rest/RestWorkflowInterceptor.java      |   3 -
 .../rest/handler/AbstractContentTypeHandler.java   |   1 -
 .../struts2/rest/handler/AllowedClassNames.java    |   1 -
 .../struts2/rest/handler/AllowedClasses.java       |   1 -
 .../struts2/rest/handler/ContentTypeHandler.java   |   3 -
 .../rest/handler/FormUrlEncodedHandler.java        |   2 -
 .../apache/struts2/rest/handler/HtmlHandler.java   |   3 -
 .../struts2/rest/handler/JacksonLibHandler.java    |   3 -
 .../struts2/rest/handler/JsonLibHandler.java       |   3 -
 .../rest/handler/MultipartFormDataHandler.java     |   2 -
 .../struts2/rest/handler/XStreamHandler.java       |   3 -
 .../rest/handler/XStreamPermissionProvider.java    |   1 -
 plugins/rest/src/main/resources/struts-plugin.xml  |   2 -
 .../rest/ContentTypeHandlerManagerTest.java        |   3 -
 .../rest/DefaultContentTypeHandlerManagerTest.java |  18 ++
 .../struts2/rest/DefaultHttpHeadersTest.java       |   3 -
 .../struts2/rest/RestActionInvocationTest.java     |  18 ++
 .../apache/struts2/rest/RestActionMapperTest.java  |   3 -
 .../struts2/rest/RestWorkflowInterceptorTest.java  |   2 -
 .../org/apache/struts2/rest/handler/Contact.java   |   3 -
 .../rest/handler/JacksonLibHandlerTest.java        |   3 -
 .../struts2/rest/handler/JsonLibHandlerTest.java   |   3 -
 plugins/sitegraph/pom.xml                          |   2 -
 .../src/main/java/org/apache/struts2/Main.java     |   3 -
 .../org/apache/struts2/sitegraph/SiteGraph.java    |   3 -
 .../struts2/sitegraph/StrutsConfigRetriever.java   |   3 -
 .../struts2/sitegraph/entities/FileBasedView.java  |   3 -
 .../struts2/sitegraph/entities/FreeMarkerView.java |   3 -
 .../apache/struts2/sitegraph/entities/JspView.java |   3 -
 .../apache/struts2/sitegraph/entities/Target.java  |   3 -
 .../struts2/sitegraph/entities/VelocityView.java   |   3 -
 .../apache/struts2/sitegraph/entities/View.java    |   3 -
 .../apache/struts2/sitegraph/model/ActionNode.java |   3 -
 .../org/apache/struts2/sitegraph/model/Graph.java  |   3 -
 .../struts2/sitegraph/model/IndentWriter.java      |   3 -
 .../org/apache/struts2/sitegraph/model/Link.java   |   3 -
 .../org/apache/struts2/sitegraph/model/Render.java |   3 -
 .../struts2/sitegraph/model/SiteGraphNode.java     |   3 -
 .../apache/struts2/sitegraph/model/SubGraph.java   |   3 -
 .../apache/struts2/sitegraph/model/ViewNode.java   |   3 -
 .../struts2/sitegraph/renderers/DOTRenderer.java   |   3 -
 .../apache/struts2/sitegraph/SiteGraphTest.java    |   3 -
 .../org/apache/struts2/sitegraph/struts.xml        |   2 -
 .../sitegraph/tutorial/sitegraph/guess-error.ftl   |   2 -
 .../sitegraph/tutorial/sitegraph/guess-input.ftl   |   2 -
 plugins/sitemesh/pom.xml                           |   2 -
 .../sitemesh/FreemarkerDecoratorServlet.java       |   2 -
 .../FreemarkerMapper2DecoratorSelector.java        |   7 -
 .../struts2/sitemesh/FreemarkerPageFilter.java     |   3 -
 .../struts2/sitemesh/NoneDecoratorMapper.java      |   3 -
 .../sitemesh/OldDecorator2NewStrutsDecorator.java  |   3 -
 .../OldDecorator2NewStrutsFreemarkerDecorator.java |   9 +-
 .../OldDecorator2NewStrutsVelocityDecorator.java   |   8 +-
 .../struts2/sitemesh/VelocityDecoratorServlet.java |   8 +-
 .../sitemesh/VelocityMapper2DecoratorSelector.java |   6 -
 .../struts2/sitemesh/VelocityPageFilter.java       |   2 -
 .../sitemesh/src/main/resources/struts-plugin.xml  |   2 -
 plugins/spring/pom.xml                             |   2 -
 .../struts2/spring/ClassReloadingBeanFactory.java  |   3 -
 .../ClassReloadingInstantiationStrategy.java       |   2 -
 .../ClassReloadingXMLWebApplicationContext.java    |   2 -
 .../struts2/spring/StrutsSpringObjectFactory.java  |   5 -
 .../spring/src/main/resources/struts-plugin.xml    |   2 -
 .../spring/StrutsSpringObjectFactoryTest.java      |   3 -
 ...sSpringObjectFactoryTest-applicationContext.xml |   2 -
 plugins/testng/pom.xml                             |   2 -
 .../java/org/apache/struts2/StrutsTestCase.java    |   3 -
 .../apache/struts2/TestNGStrutsTestCaseTest.java   |   3 -
 plugins/tiles/pom.xml                              |   2 -
 .../struts2/tiles/I18NAttributeEvaluator.java      |   1 -
 .../struts2/tiles/StrutsApplicationResource.java   |   1 -
 .../struts2/tiles/StrutsAttributeEvaluator.java    |   1 -
 .../tiles/StrutsFreeMarkerAttributeRenderer.java   |   1 -
 .../struts2/tiles/StrutsPreparerFactory.java       |   1 -
 .../struts2/tiles/StrutsTilesContainerFactory.java |   1 -
 .../struts2/tiles/StrutsTilesInitializer.java      |   1 -
 .../apache/struts2/tiles/StrutsTilesListener.java  |   1 -
 .../struts2/tiles/StrutsTilesLocaleResolver.java   |   1 -
 .../StrutsWildcardServletApplicationContext.java   |   1 -
 .../apache/struts2/views/tiles/TilesResult.java    |   3 -
 plugins/tiles/src/main/resources/struts-plugin.xml |   2 -
 .../tiles/StrutsTilesAnnotationProcessorTest.java  |  18 ++
 .../tiles/TilesTestActionMultipleAnnotations.java  |  18 ++
 .../tiles/TilesTestActionSingleAnnotation.java     |  18 ++
 .../TilesTestActionSingleAnnotationAllEmpty.java   |  18 ++
 pom.xml                                            | 118 ++++---
 src/etc/header.txt                                 |   2 -
 src/main/idea/project.xml                          |  36 ---
 src/main/idea/workspace.xml                        | 101 ------
 2420 files changed, 22909 insertions(+), 11773 deletions(-)
 delete mode 100644 plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/mbeans-descriptors.xml
 rename plugins/embeddedjsp/src/main/{java => resources}/org/apache/struts2/el/Messages.properties (70%)
 rename plugins/embeddedjsp/src/main/{java => resources}/org/apache/struts2/el/Messages_es.properties (72%)
 copy plugins/{junit/src/test/resources/struts-convention-configuration.xml => embeddedjsp/src/main/resources/org/apache/struts2/jasper/servlet/mbeans-descriptors.xml} (59%)
 rename plugins/embeddedjsp/src/main/{java => resources}/org/apache/struts2/jasper/tagplugins/jstl/tagPlugins.xml (73%)
 delete mode 100644 src/main/idea/project.xml
 delete mode 100644 src/main/idea/workspace.xml

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].

Mime
View raw message