Repository: struts Updated Branches: refs/heads/master 65e2a864a -> f9fb3549c
Merge pull request #3 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/e05f9f01 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e05f9f01 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e05f9f01 Branch: refs/heads/master Commit: e05f9f01804bc64ace15bfc573ef483da583e5a7 Parents: c167d6c 249d2f8 Author: victor sosa <victors...@users.noreply.github.com> Authored: Thu Jan 21 08:00:54 2016 -0400 Committer: victor sosa <victors...@users.noreply.github.com> Committed: Thu Jan 21 08:00:54 2016 -0400 ---------------------------------------------------------------------- .gitignore | 1 - assembly/pom.xml | 5 -- assembly/src/main/assembly/all.xml | 4 -- assembly/src/main/assembly/docs.xml | 4 -- bom/pom.xml | 5 -- .../providers/XmlConfigurationProvider.java | 17 +++-- .../multipart/JakartaMultiPartRequest.java | 12 +++- .../XmlConfigurationProviderResultsTest.java | 54 +++++++++++++++ .../providers/xwork-test-result-names.xml | 48 ++++++++++++++ .../convention/DefaultResultMapBuilder.java | 20 +++--- .../struts2/convention/annotation/Result.java | 2 +- .../convention/DefaultResultMapBuilderTest.java | 58 ++++++++++++++++ .../PackageBasedActionConfigBuilderTest.java | 4 +- .../result/ActionLevelResultsNamesAction.java | 47 +++++++++++++ .../rest/DefaultContentTypeHandlerManager.java | 69 +++++++++++++++++--- .../apache/struts2/rest/RestActionMapper.java | 3 +- .../DefaultContentTypeHandlerManagerTest.java | 42 ++++++++++++ .../struts2/rest/RestActionMapperTest.java | 39 +++++++++++ pom.xml | 5 -- 19 files changed, 389 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
