Merge branch 'master' into easymock_update # Conflicts: # core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/eddd8e05 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/eddd8e05 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/eddd8e05 Branch: refs/heads/master Commit: eddd8e054771d9330ec142215f75591ecb3e3964 Parents: 20e9d13 f34283b Author: victorsosa <victor.s...@peopleware.do> Authored: Thu Mar 3 14:38:13 2016 -0400 Committer: victorsosa <victor.s...@peopleware.do> Committed: Thu Mar 3 14:38:13 2016 -0400 ---------------------------------------------------------------------- .gitignore | 1 - .../showcase/tiles/TilesAnnotationsAction.java | 40 +++ apps/showcase/src/main/webapp/WEB-INF/tiles.xml | 10 +- .../src/main/webapp/WEB-INF/tiles/body.jsp | 3 + .../webapp/WEB-INF/tiles/layout-annotations.jsp | 14 ++ .../WEB-INF/validation/ajaxFormSubmit.jsp | 7 +- assembly/pom.xml | 5 - assembly/src/main/assembly/all.xml | 4 - assembly/src/main/assembly/docs.xml | 4 - bom/pom.xml | 5 - .../xwork2/DefaultActionInvocation.java | 7 +- .../com/opensymphony/xwork2/XWorkConstants.java | 1 + ...ervletContextAwareConfigurationProvider.java | 32 +++ .../xwork2/config/entities/ActionConfig.java | 1 + .../xwork2/config/entities/AllowedMethods.java | 30 +++ .../xwork2/config/entities/PackageConfig.java | 2 +- .../xwork2/config/impl/ActionConfigMatcher.java | 1 + .../providers/XmlConfigurationProvider.java | 32 +-- .../interceptor/DefaultWorkflowInterceptor.java | 4 +- .../interceptor/ParametersInterceptor.java | 29 +-- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 15 +- .../xwork2/ognl/OgnlValueStack.java | 1 + .../xwork2/ognl/SecurityMemberAccess.java | 16 +- .../xwork2/util/LocalizedTextUtil.java | 26 +- .../validator/DelegatingValidatorContext.java | 7 +- .../org/apache/struts2/StrutsConstants.java | 1 + .../org/apache/struts2/components/UIBean.java | 4 +- .../config/DefaultBeanSelectionProvider.java | 1 + .../apache/struts2/dispatcher/Dispatcher.java | 3 + .../multipart/JakartaMultiPartRequest.java | 12 +- .../struts2/interceptor/CookieInterceptor.java | 12 +- .../interceptor/MessageStoreInterceptor.java | 58 +---- .../MessageStorePreResultListener.java | 95 +++++++ core/src/main/resources/struts-default.xml | 20 +- .../xwork2/DefaultActionInvocationTest.java | 3 + .../config/entities/ActionConfigTest.java | 4 +- .../config/entities/AllowedMethodsTest.java | 15 ++ .../config/impl/ActionConfigMatcherTest.java | 16 +- ...ConfigurationProviderAllowedMethodsTest.java | 38 ++- .../XmlConfigurationProviderResultsTest.java | 54 ++++ .../xwork2/ognl/SecurityMemberAccessTest.java | 20 +- .../validator/VisitorFieldValidatorTest.java | 2 +- .../interceptor/CookieInterceptorTest.java | 20 -- .../MessageStoreInterceptorTest.java | 184 +++----------- .../MessageStorePreResultListenerTest.java | 252 +++++++++++++++++++ .../apache/struts2/views/jsp/ActionTagTest.java | 3 +- .../com/opensymphony/xwork2/TestBean.properties | 2 +- .../providers/xwork-test-allowed-methods.xml | 6 +- .../providers/xwork-test-result-names.xml | 48 ++++ .../convention/DefaultResultMapBuilder.java | 20 +- .../PackageBasedActionConfigBuilder.java | 6 +- .../convention/annotation/AllowedMethods.java | 2 +- .../struts2/convention/annotation/Result.java | 2 +- .../convention/DefaultResultMapBuilderTest.java | 58 +++++ .../PackageBasedActionConfigBuilderTest.java | 4 +- .../actions/allowedmethods/package-info.java | 2 +- .../result/ActionLevelResultsNamesAction.java | 47 ++++ .../rest/DefaultContentTypeHandlerManager.java | 69 ++++- .../apache/struts2/rest/RestActionMapper.java | 3 +- .../DefaultContentTypeHandlerManagerTest.java | 42 ++++ .../struts2/rest/RestActionMapperTest.java | 39 +++ .../tiles/StrutsTilesAnnotationProcessor.java | 177 +++++++++++++ .../tiles/annotation/TilesAddAttribute.java | 30 +++ .../tiles/annotation/TilesAddListAttribute.java | 28 +++ .../tiles/annotation/TilesDefinition.java | 66 +++++ .../tiles/annotation/TilesDefinitions.java | 36 +++ .../tiles/annotation/TilesPutAttribute.java | 32 +++ .../tiles/annotation/TilesPutListAttribute.java | 32 +++ .../apache/struts2/views/tiles/TilesResult.java | 69 ++++- .../StrutsTilesAnnotationProcessorTest.java | 147 +++++++++++ .../TilesTestActionMultipleAnnotations.java | 12 + .../tiles/TilesTestActionSingleAnnotation.java | 49 ++++ ...TilesTestActionSingleAnnotationAllEmpty.java | 28 +++ pom.xml | 8 +- .../VisitorValidatorTestAction.properties | 1 + 75 files changed, 1794 insertions(+), 385 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/eddd8e05/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/eddd8e05/pom.xml ----------------------------------------------------------------------
