Return-Path: 
 <commits-return-14907-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 097A618B34
	for <apmail-struts-commits-archive@minotaur.apache.org>;
 Mon,  5 Oct 2015 19:25:37 +0000 (UTC)
Received: (qmail 18152 invoked by uid 500); 5 Oct 2015 19:25:14 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 18113 invoked by uid 500); 5 Oct 2015 19:25:14 -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 18103 invoked by uid 99); 5 Oct 2015 19:25:14 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Oct 2015 19:25:14 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id AF31EE03CE; Mon,  5 Oct 2015 19:25:14 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jogep@apache.org
To: commits@struts.apache.org
Date: Mon, 05 Oct 2015 19:25:14 -0000
Message-Id: <86da5cdf17bc4f99acc00522dba9b47a@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] struts git commit: WW-4540 Enable Strict DMI be default

Repository: struts
Updated Branches:
  refs/heads/master 50ae859da -> a6241552b


WW-4540 Enable Strict DMI be default

- Extend global allowed methods in rest plugin with rest plugin specific default methods


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

Branch: refs/heads/master
Commit: ecde389ee6fa2a58318d5c78d0186edf8b189b63
Parents: 50ae859
Author: Johannes Geppert <jogep@apache.org>
Authored: Mon Oct 5 20:15:51 2015 +0200
Committer: Johannes Geppert <jogep@apache.org>
Committed: Mon Oct 5 20:15:51 2015 +0200

----------------------------------------------------------------------
 plugins/rest/src/main/resources/struts-plugin.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/ecde389e/plugins/rest/src/main/resources/struts-plugin.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/src/main/resources/struts-plugin.xml b/plugins/rest/src/main/resources/struts-plugin.xml
index 6607dcf..36dbc5f 100644
--- a/plugins/rest/src/main/resources/struts-plugin.xml
+++ b/plugins/rest/src/main/resources/struts-plugin.xml
@@ -22,8 +22,8 @@
  */
 -->
 <!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
-	"http://struts.apache.org/dtds/struts-2.3.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+        "http://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 
@@ -109,6 +109,8 @@
 
         <default-class-ref class="org.apache.struts2.rest.RestActionSupport"/>
 
+        <global-allowed-methods>execute,input,back,cancel,browse,save,delete,list,index,show,create,update,destroy,edit,editNew</global-allowed-methods>
+
     </package>
 
 </struts>