struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [06/20] struts git commit: Merge pull request #14 from apache/master
Date Sun, 12 Jun 2016 13:49:18 GMT
Merge pull request #14 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/ca74ac36
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ca74ac36
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ca74ac36

Branch: refs/heads/master
Commit: ca74ac36fc7eb60e41eeaa8a539771169f900dd6
Parents: 47cf4ff f238cf4
Author: victor sosa <victorsosa@users.noreply.github.com>
Authored: Wed May 4 10:47:57 2016 -0400
Committer: victor sosa <victorsosa@users.noreply.github.com>
Committed: Wed May 4 10:47:57 2016 -0400

----------------------------------------------------------------------
 .../xwork2/config/entities/ActionConfig.java    | 16 +++++--
 .../xwork2/config/entities/AllowedMethods.java  | 37 +++++++++++-----
 .../xwork2/config/impl/ActionConfigMatcher.java |  1 +
 .../providers/XmlConfigurationProvider.java     |  1 +
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  |  6 +--
 .../dispatcher/mapper/DefaultActionMapper.java  |  4 +-
 .../apache/struts2/views/xslt/XSLTResult.java   |  7 +--
 core/src/main/resources/struts-default.xml      |  2 +
 .../config/entities/AllowedMethodsTest.java     | 46 +++++++++++++++++---
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 15 +++++++
 .../apache/struts2/rest/RestActionMapper.java   |  2 +-
 pom.xml                                         |  2 +-
 12 files changed, 105 insertions(+), 34 deletions(-)
----------------------------------------------------------------------



Mime
View raw message