Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F096010921 for ; Thu, 6 Mar 2014 21:36:45 +0000 (UTC) Received: (qmail 18859 invoked by uid 500); 6 Mar 2014 21:36:23 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 18517 invoked by uid 500); 6 Mar 2014 21:36:15 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 18244 invoked by uid 99); 6 Mar 2014 21:36:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 21:36:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6575193FCBB; Thu, 6 Mar 2014 21:36:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Thu, 06 Mar 2014 21:36:13 -0000 Message-Id: <70db5d727a994bbd8fcb123766228351@git.apache.org> In-Reply-To: <49f8bfc5752540a7b5f7723a10974e87@git.apache.org> References: <49f8bfc5752540a7b5f7723a10974e87@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/20] git commit: Merge branch 'develop' into feature/move-jsps-under-webinf 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/develop Commit: 4360a06662dcdb3c08d4ba9c3f8e2679eecddad1 Parents: 6f43464 9c5177c Author: Lukasz Lenart Authored: Fri Feb 28 10:17:19 2014 +0100 Committer: Lukasz Lenart 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(-) ----------------------------------------------------------------------