Merge pull request #7 from apache/master update pull
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f34283b2 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f34283b2 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f34283b2 Branch: refs/heads/master Commit: f34283b26eea874d2f76ad0cadf95c33b2d2aeae Parents: a2c5bc8 4ea8883 Author: victor sosa <victors...@users.noreply.github.com> Authored: Sat Feb 27 11:20:39 2016 -0400 Committer: victor sosa <victors...@users.noreply.github.com> Committed: Sat Feb 27 11:20:39 2016 -0400 ---------------------------------------------------------------------- ...ervletContextAwareConfigurationProvider.java | 32 ++++++++++++++++++++ .../xwork2/config/entities/ActionConfig.java | 1 + .../xwork2/config/entities/AllowedMethods.java | 27 +++++++++++++++++ .../xwork2/config/entities/PackageConfig.java | 2 +- .../providers/XmlConfigurationProvider.java | 14 ++++----- .../interceptor/DefaultWorkflowInterceptor.java | 4 +-- .../interceptor/ParametersInterceptor.java | 29 +----------------- .../validator/DelegatingValidatorContext.java | 7 ++++- .../org/apache/struts2/components/UIBean.java | 4 +-- .../apache/struts2/dispatcher/Dispatcher.java | 3 ++ .../struts2/interceptor/CookieInterceptor.java | 12 +------- .../config/entities/ActionConfigTest.java | 4 +-- .../validator/VisitorFieldValidatorTest.java | 2 +- .../interceptor/CookieInterceptorTest.java | 27 ----------------- .../com/opensymphony/xwork2/TestBean.properties | 2 +- .../tiles/annotation/TilesDefinition.java | 8 ++--- .../VisitorValidatorTestAction.properties | 1 + 17 files changed, 91 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
