You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/21 08:45:28 UTC
[4/4] struts git commit: Merge branch 'WW-4590'
Merge branch 'WW-4590'
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/11561cb2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/11561cb2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/11561cb2
Branch: refs/heads/master
Commit: 11561cb29998655c458b3f94cb7cf9431c4090a8
Parents: cae5709 2a46a65
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Jan 21 08:45:07 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Jan 21 08:45:07 2016 +0100
----------------------------------------------------------------------
.../providers/XmlConfigurationProvider.java | 17 ++++--
.../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 ++++++++++++++++
8 files changed, 235 insertions(+), 15 deletions(-)
----------------------------------------------------------------------