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 2016/06/12 17:38:41 UTC
[1/3] struts git commit: add allowed methods to ActionBuilder
Repository: struts
Updated Branches:
refs/heads/master 08360cb91 -> b866e0e88
add allowed methods to ActionBuilder
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0d92fd0e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0d92fd0e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0d92fd0e
Branch: refs/heads/master
Commit: 0d92fd0ee5d4c23aabe7bf3c2ef1b30ff3e5c00d
Parents: 095960b
Author: jumiller <ju...@utah.gov>
Authored: Thu Jun 9 15:39:23 2016 -0600
Committer: jumiller <ju...@utah.gov>
Committed: Thu Jun 9 15:39:23 2016 -0600
----------------------------------------------------------------------
.../apache/struts2/convention/ConventionUnknownHandler.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/0d92fd0e/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index b7c7acf..717bcc5 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -106,7 +106,7 @@ public class ConventionUnknownHandler implements UnknownHandler {
this.redirectToSlash = Boolean.parseBoolean(redirectToSlash);
- allowedMethods = TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse");
+ allowedMethods = TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse,index");
}
public ActionConfig handleUnknownAction(String namespace, String actionName)
@@ -219,7 +219,10 @@ public class ConventionUnknownHandler implements UnknownHandler {
results.put(Action.SUCCESS, config);
return new ActionConfig.Builder(defaultParentPackageName, "execute", ActionSupport.class.getName()).
- addInterceptors(interceptors).addResultConfigs(results).build();
+ addInterceptors(interceptors).
+ addResultConfigs(results).
+ addAllowedMethod(allowedMethods).
+ build();
}
private Result scanResultsByExtension(String ns, String actionName, String pathPrefix,
[2/3] struts git commit: add GlobalAllowedMethods getter to
PackageConfig and modified getActionConfig method in ConventionUnknownHandler
to reference it
Posted by lu...@apache.org.
add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig method in ConventionUnknownHandler to reference it
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dd3b80f2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dd3b80f2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dd3b80f2
Branch: refs/heads/master
Commit: dd3b80f2be6feb72de808087edcf7914e9d5bb6b
Parents: 0d92fd0
Author: jumiller <ju...@utah.gov>
Authored: Fri Jun 10 07:59:27 2016 -0600
Committer: jumiller <ju...@utah.gov>
Committed: Fri Jun 10 07:59:27 2016 -0600
----------------------------------------------------------------------
.../opensymphony/xwork2/config/entities/PackageConfig.java | 7 +++++++
.../apache/struts2/convention/ConventionUnknownHandler.java | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/dd3b80f2/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index c0e9477..bb34018 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -346,6 +346,13 @@ public class PackageConfig extends Located implements Comparable, Serializable,
return globalExceptionMappingConfigs;
}
+ /**
+ * gets the GlobalAllowedMethods local to this package
+ *
+ * @return a Set of method names allowed to be executed if strict method invocation is enabled
+ */
+ public Set<String> getGlobalAllowedMethods() { return globalAllowedMethods; }
+
public boolean isStrictMethodInvocation() {
return strictMethodInvocation;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/dd3b80f2/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index 717bcc5..ace9446 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -221,7 +221,7 @@ public class ConventionUnknownHandler implements UnknownHandler {
return new ActionConfig.Builder(defaultParentPackageName, "execute", ActionSupport.class.getName()).
addInterceptors(interceptors).
addResultConfigs(results).
- addAllowedMethod(allowedMethods).
+ addAllowedMethod(pkg.getGlobalAllowedMethods()).
build();
}
[3/3] struts git commit: WW-4643 Fixes SMI when used with Action-less
resutls
Posted by lu...@apache.org.
WW-4643 Fixes SMI when used with Action-less resutls
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b866e0e8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b866e0e8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b866e0e8
Branch: refs/heads/master
Commit: b866e0e88000d52d4d16753ee393f8a00be13058
Parents: 08360cb dd3b80f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Jun 12 19:38:31 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Jun 12 19:38:31 2016 +0200
----------------------------------------------------------------------
.../opensymphony/xwork2/config/entities/PackageConfig.java | 7 +++++++
.../apache/struts2/convention/ConventionUnknownHandler.java | 7 +++++--
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------