struts git commit: WW-4589 do not overwrite explicit method name

2016-01-20 Thread lukaszlenart
Repository: struts Updated Branches: refs/heads/master 3163d6c38 -> 1fb695a82 WW-4589 do not overwrite explicit method name Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1fb695a8 Tree: http://git-wip-us.apache.org/repo

[2/2] struts git commit: Merge branch 'support-2-3' of https://git-wip-us.apache.org/repos/asf/struts into support-2-3

2016-01-20 Thread lukaszlenart
Merge branch 'support-2-3' of https://git-wip-us.apache.org/repos/asf/struts into support-2-3 Conflicts: plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/a

[1/2] struts git commit: WW-4589 do not overwrite explicit method name

2016-01-20 Thread lukaszlenart
Repository: struts Updated Branches: refs/heads/support-2-3 a39879317 -> 10a612c9d WW-4589 do not overwrite explicit method name Conflicts: plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit

[3/3] struts git commit: Merge branch 'WW-4456'

2016-01-20 Thread lukaszlenart
Merge branch 'WW-4456' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/04f5813c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/04f5813c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/04f5813c Branch: ref

[2/3] struts git commit: WW-4456 - Got NPE when File Upload Limitation exceeds in portal env.

2016-01-20 Thread lukaszlenart
WW-4456 - Got NPE when File Upload Limitation exceeds in portal env. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bc8d3746 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bc8d3746 Diff: http://git-wip-us.apache.or

[1/3] struts git commit: Merge pull request #1 from apache/master

2016-01-20 Thread lukaszlenart
Repository: struts Updated Branches: refs/heads/master 1fb695a82 -> 04f5813c9 Merge pull request #1 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/c167d6c8 Tree: http://git-wip-us.apache.o

[1/2] struts git commit: WW-4588: Improve the Struts2 Rest plugin to honor Accept header

2016-01-20 Thread lukaszlenart
Repository: struts Updated Branches: refs/heads/master 04f5813c9 -> cae57093b WW-4588: Improve the Struts2 Rest plugin to honor Accept header Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7899f10d Tree: http://git-wip

[2/2] struts git commit: Merge branch 'WW-4588'

2016-01-20 Thread lukaszlenart
Merge branch 'WW-4588' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cae57093 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cae57093 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cae57093 Branch: ref

struts git commit: WW-4588: Improve the Struts2 Rest plugin to honor Accept header

2016-01-20 Thread lukaszlenart
Repository: struts Updated Branches: refs/heads/support-2-3 10a612c9d -> 2ec3890dc WW-4588: Improve the Struts2 Rest plugin to honor Accept header Conflicts: plugins/rest/src/main/java/org/apache/struts2/rest/DefaultContentTypeHandlerManager.java Project: http://git-wip-us.apache.o

[4/4] struts git commit: Merge branch 'WW-4590'

2016-01-20 Thread lukaszlenart
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: ref

[3/4] struts git commit: Result annotation name attribute as an array, removed one of ResultInfo constructors

2016-01-20 Thread lukaszlenart
Result annotation name attribute as an array, removed one of ResultInfo constructors Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2a46a658 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2a46a658 Diff: http://gi

[2/4] struts git commit: Cleaner result name parsing

2016-01-20 Thread lukaszlenart
Cleaner result name parsing Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/930f6e4c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/930f6e4c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/930f6e4c Branch

[1/4] struts git commit: WW-4590 - Allow to use multiple names in result

2016-01-20 Thread lukaszlenart
Repository: struts Updated Branches: refs/heads/master cae57093b -> 11561cb29 WW-4590 - Allow to use multiple names in result Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/087cf610 Tree: http://git-wip-us.apache.org/re