Merge branch 'develop' into feature/move-jsps-under-webinf
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4360a066 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4360a066 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4360a066 Branch: refs/heads/feature/move-jsps-under-webinf Commit: 4360a06662dcdb3c08d4ba9c3f8e2679eecddad1 Parents: 6f43464 9c5177c Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Feb 28 10:17:19 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Feb 28 10:17:19 2014 +0100 ---------------------------------------------------------------------- .../xwork2/interceptor/ParametersInterceptor.java | 8 -------- .../com/opensymphony/xwork2/ognl/OgnlValueStack.java | 4 ---- .../com/opensymphony/xwork2/ognl/PropertiesJudge.java | 7 ------- .../opensymphony/xwork2/ognl/SecurityMemberAccess.java | 13 +------------ .../opensymphony/xwork2/util/LocalizedTextUtil.java | 9 ++++++++- .../xwork2/util/MemberAccessValueStack.java | 4 ---- 6 files changed, 9 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
