Merge pull request #6 from apache/master pull update
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a2c5bc83 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a2c5bc83 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a2c5bc83 Branch: refs/heads/master Commit: a2c5bc835ec06483af6175fc0abf67714fb28711 Parents: 46bd92f 0cc5fca Author: victor sosa <[email protected]> Authored: Thu Feb 4 13:12:22 2016 -0400 Committer: victor sosa <[email protected]> Committed: Thu Feb 4 13:12:22 2016 -0400 ---------------------------------------------------------------------- .../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 ++ .../xwork2/DefaultActionInvocation.java | 7 +- .../xwork2/config/entities/AllowedMethods.java | 3 + .../xwork2/config/impl/ActionConfigMatcher.java | 1 + .../providers/XmlConfigurationProvider.java | 1 - .../interceptor/MessageStoreInterceptor.java | 58 +---- .../MessageStorePreResultListener.java | 95 +++++++ .../xwork2/DefaultActionInvocationTest.java | 3 + .../config/entities/AllowedMethodsTest.java | 15 ++ .../config/impl/ActionConfigMatcherTest.java | 16 +- ...ConfigurationProviderAllowedMethodsTest.java | 38 ++- .../MessageStoreInterceptorTest.java | 184 +++----------- .../MessageStorePreResultListenerTest.java | 252 +++++++++++++++++++ .../apache/struts2/views/jsp/ActionTagTest.java | 3 +- .../providers/xwork-test-allowed-methods.xml | 6 +- .../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 | 3 + 31 files changed, 1233 insertions(+), 225 deletions(-) ----------------------------------------------------------------------
