You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/10/05 21:25:14 UTC
[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 <jo...@apache.org>
Authored: Mon Oct 5 20:15:51 2015 +0200
Committer: Johannes Geppert <jo...@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>
[2/2] struts git commit: WW-4540 Enable Strict DMI be default
Posted by jo...@apache.org.
WW-4540 Enable Strict DMI be default
- Add to global allowed methods to rest showcase configuration
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a6241552
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a6241552
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a6241552
Branch: refs/heads/master
Commit: a6241552b67986056da32a70ae75d69c5c40a878
Parents: ecde389
Author: Johannes Geppert <jo...@apache.org>
Authored: Mon Oct 5 21:25:06 2015 +0200
Committer: Johannes Geppert <jo...@apache.org>
Committed: Mon Oct 5 21:25:06 2015 +0200
----------------------------------------------------------------------
apps/rest-showcase/src/main/resources/struts.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a6241552/apps/rest-showcase/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/src/main/resources/struts.xml b/apps/rest-showcase/src/main/resources/struts.xml
index 3b4fc2c..16d0739 100644
--- a/apps/rest-showcase/src/main/resources/struts.xml
+++ b/apps/rest-showcase/src/main/resources/struts.xml
@@ -21,16 +21,20 @@
* under the License.
*/
-->
-
<!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>
<!-- Overwrite Convention -->
<constant name="struts.convention.action.suffix" value="Controller"/>
<constant name="struts.convention.action.mapAllMatches" value="true"/>
- <constant name="struts.convention.default.parent.package" value="rest-default"/>
+ <constant name="struts.convention.default.parent.package" value="rest-showcase"/>
<constant name="struts.convention.package.locators" value="example"/>
+
+ <package name="rest-showcase" extends="rest-default">
+ <global-allowed-methods>index,show,create,update,destroy,deleteConfirm,edit,editNew</global-allowed-methods>
+ </package>
</struts>
\ No newline at end of file