struts git commit: Change to the documentation
Repository: struts Updated Branches: refs/heads/master abf7bfa34 -> 164356809 Change to the documentation To make it clear that the behavior is not limited to validation errors, but also extendend to conversion errors and (most important) to action errors, that will be stored and retrieved by the Message Store Interceptor during a redirection, and that will generate an undesired result. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/16435680 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/16435680 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/16435680 Branch: refs/heads/master Commit: 1643568095edd8e0f9a3147c0edf396cd6906b44 Parents: abf7bfa Author: Andrea Ligios Authored: Mon Jul 25 17:18:04 2016 +0200 Committer: GitHub Committed: Mon Jul 25 17:18:04 2016 +0200 -- .../xwork2/interceptor/DefaultWorkflowInterceptor.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/16435680/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java -- diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java index cd162a7..271fa6d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java +++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java @@ -27,7 +27,8 @@ import java.lang.reflect.Method; /** * * - * An interceptor that makes sure there are not validation errors before allowing the interceptor chain to continue. + * An interceptor that makes sure there are not validation, conversion or action errors before allowing the interceptor chain to continue. + * If a single FieldError or ActionError (including the ones replicated by the Message Store Interceptor in a redirection) is found, the INPUT result will be triggered. * This interceptor does not perform any validation. * *
[1/2] struts git commit: WW-4669 Reverts back to default RegEx
Repository: struts
Updated Branches:
refs/heads/master 164356809 -> 0bd2e7058
WW-4669 Reverts back to default RegEx
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c6d07d3a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c6d07d3a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c6d07d3a
Branch: refs/heads/master
Commit: c6d07d3ab66083f32ead69a9e2ff709d4c29dcd3
Parents: 1643568
Author: Lukasz Lenart
Authored: Wed Jul 27 08:28:00 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Jul 27 08:28:00 2016 +0200
--
.../org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/c6d07d3a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index 005f9f2..d0e89be 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
protected boolean allowSlashesInActionNames = false;
protected boolean alwaysSelectFullNamespace = false;
protected PrefixTrie prefixTrie = null;
-protected Pattern allowedActionNames =
Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$");
+protected Pattern allowedActionNames =
Pattern.compile("[a-zA-Z0-9._!/\\-]*");
private boolean allowActionPrefix = false;
private boolean allowActionCrossNamespaceAccess = false;
[2/2] struts git commit: WW-4670 Upgrades JFreeChart to the latest version
WW-4670 Upgrades JFreeChart to the latest version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0bd2e705 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0bd2e705 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0bd2e705 Branch: refs/heads/master Commit: 0bd2e705897b365740e72229dbd9eb64c8c32229 Parents: c6d07d3 Author: Lukasz Lenart Authored: Wed Jul 27 08:37:00 2016 +0200 Committer: Lukasz Lenart Committed: Wed Jul 27 08:37:00 2016 +0200 -- plugins/jfreechart/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0bd2e705/plugins/jfreechart/pom.xml -- diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index fec4910..b3758ef 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -35,9 +35,9 @@ -jfree +org.jfree jcommon -1.0.12 +1.0.23 provided @@ -47,9 +47,9 @@ -jfree +org.jfree jfreechart -1.0.9 +1.0.19 provided @@ -68,7 +68,7 @@ jsp-api provided - + org.easymock easymock test
