You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/09/28 20:53:01 UTC
[12/33] struts git commit: Adds missing comma
Adds missing comma
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63bb6e30
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63bb6e30
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63bb6e30
Branch: refs/heads/master
Commit: 63bb6e30e75facf5382608857494cf971f0378dd
Parents: 47a01ea
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Aug 31 21:06:06 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Aug 31 21:06:06 2015 +0200
----------------------------------------------------------------------
core/src/main/resources/struts-2.5.dtd | 2 +-
core/src/main/resources/struts-default.xml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/63bb6e30/core/src/main/resources/struts-2.5.dtd
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-2.5.dtd b/core/src/main/resources/struts-2.5.dtd
index 6591ddb..0845eee 100644
--- a/core/src/main/resources/struts-2.5.dtd
+++ b/core/src/main/resources/struts-2.5.dtd
@@ -37,7 +37,7 @@
order CDATA #IMPLIED
>
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-allowed-methods? global-exception-mappings?, action*)>
+<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-allowed-methods?, global-exception-mappings?, action*)>
<!ATTLIST package
name CDATA #REQUIRED
extends CDATA #IMPLIED
http://git-wip-us.apache.org/repos/asf/struts/blob/63bb6e30/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 d7a0ee0..f1684e5 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -358,11 +358,12 @@
</interceptors>
- <global-allowed-methods>execute,input,back,cancel,browse</global-allowed-methods>
-
<default-interceptor-ref name="defaultStack"/>
<default-class-ref class="com.opensymphony.xwork2.ActionSupport" />
+
+ <global-allowed-methods>execute,input,back,cancel,browse</global-allowed-methods>
+
</package>
</struts>