Return-Path: 
 <commits-return-13260-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
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 E611F117DF
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Fri, 27 Jun 2014 11:23:41 +0000 (UTC)
Received: (qmail 98684 invoked by uid 500); 27 Jun 2014 11:23:40 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 98625 invoked by uid 500); 27 Jun 2014 11:23:40 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 98538 invoked by uid 99); 27 Jun 2014 11:23:40 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2014 11:23:40 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 501A498D6E2; Fri, 27 Jun 2014 11:23:40 +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: Fri, 27 Jun 2014 11:24:14 -0000
Message-Id: <74c9adbeddfd4d61a4f0ef83bbc3e7ba@git.apache.org>
In-Reply-To: <bc3e13ddde7a425ca49a66530c8114d9@git.apache.org>
References: <bc3e13ddde7a425ca49a66530c8114d9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [46/50] git commit: Excludes ActionContext from Ognl evaluation

Excludes ActionContext from Ognl evaluation


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bbcc6014
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bbcc6014
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bbcc6014

Branch: refs/heads/feature/WW-4295-localization
Commit: bbcc6014f61e4d751114051605e8041474e5b496
Parents: eb8aae8
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Thu Jun 5 08:25:44 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Thu Jun 5 08:25:44 2014 +0200

----------------------------------------------------------------------
 core/src/main/resources/struts-default.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/bbcc6014/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 0fe8e68..49eba90 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -38,7 +38,15 @@
 
 <struts>
 
-    <constant name="struts.excludedClasses" value="java.lang.Object,java.lang.Runtime,ognl.OgnlContext,ognl.MemberAccess,ognl.ClassResolver,ognl.TypeConverter" />
+    <constant name="struts.excludedClasses"
+              value="
+                java.lang.Object,
+                java.lang.Runtime,
+                ognl.OgnlContext,
+                ognl.MemberAccess,
+                ognl.ClassResolver,
+                ognl.TypeConverter,
+                com.opensymphony.xwork2.ActionContext" />
     <!-- this must be valid regex, each '.' in package name must be escaped! -->
     <constant name="struts.excludedPackageNamePatterns" value="^java\.lang.*,^ognl.*,^javax.*" />