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/05/05 08:38:16 UTC
[1/5] struts git commit: Upgrades common-collections
Repository: struts
Updated Branches:
refs/heads/master 02b207fca -> 59210a7e0
Upgrades common-collections
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4ad08546
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4ad08546
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4ad08546
Branch: refs/heads/master
Commit: 4ad085469ee3f233e70aefadb446273224250b46
Parents: 02b207f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 5 10:37:09 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 5 10:37:09 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/4ad08546/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ffd84c1..5d284a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,7 +706,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
[4/5] struts git commit: Adds some logging
Posted by lu...@apache.org.
Adds some logging
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bb9df6c7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bb9df6c7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bb9df6c7
Branch: refs/heads/master
Commit: bb9df6c7d3d499d09d6406397aacb12e455d2852
Parents: af27d69
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 5 10:37:54 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 5 10:37:54 2016 +0200
----------------------------------------------------------------------
.../xwork2/config/providers/XmlConfigurationProvider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/bb9df6c7/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index e761b4b..4e76bb2 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -873,11 +873,13 @@ public class XmlConfigurationProvider implements ConfigurationProvider {
// user enabled Strict DMI but didn't defined action specific 'allowed-methods' so we use 'global-allowed-methods' only
allowedMethods = new HashSet<>(packageContext.getGlobalAllowedMethods());
} else {
- // Strict DMI is disabled to any method can be called
+ // Strict DMI is disabled so any method can be called
allowedMethods = new HashSet<>();
allowedMethods.add(ActionConfig.WILDCARD);
}
+ LOG.debug("Collected allowed methods: {}", allowedMethods);
+
return Collections.unmodifiableSet(allowedMethods);
}
[3/5] struts git commit: Uses pattern to calculate hashCode and equals
Posted by lu...@apache.org.
Uses pattern to calculate hashCode and equals
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/af27d692
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/af27d692
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/af27d692
Branch: refs/heads/master
Commit: af27d692dedc0c79f4d26fc4d0fc404c65227fa7
Parents: 6da61ff
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 5 10:37:42 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 5 10:37:42 2016 +0200
----------------------------------------------------------------------
.../com/opensymphony/xwork2/config/entities/AllowedMethods.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/af27d692/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
index d7741da..d81de5a 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
@@ -154,13 +154,13 @@ public class AllowedMethods {
PatternAllowedMethod that = (PatternAllowedMethod) o;
- return original.equals(that.original);
+ return allowedMethodPattern.pattern().equals(that.allowedMethodPattern.pattern());
}
@Override
public int hashCode() {
- return original.hashCode();
+ return allowedMethodPattern.pattern().hashCode();
}
@Override
[5/5] struts git commit: Fixes test
Posted by lu...@apache.org.
Fixes test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/59210a7e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/59210a7e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/59210a7e
Branch: refs/heads/master
Commit: 59210a7e0addf0ad91a6edf11f758de6f1cd9310
Parents: bb9df6c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 5 10:37:59 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 5 10:37:59 2016 +0200
----------------------------------------------------------------------
.../opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/59210a7e/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java b/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
index 6eb9f27..7957cf9 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
@@ -156,18 +156,21 @@ public class ActionConfigMatcherTest extends XWorkTestCase {
.build())
.addInterceptor(new InterceptorMapping(null, null))
.addResultConfig(new ResultConfig.Builder("success{1}", "foo.{2}").addParams(params).build())
+ .setStrictMethodInvocation(false)
.build();
map.put("foo/*/*", config);
config = new ActionConfig.Builder("package-{1}", "bar/*/**", "bar")
.methodName("do{1}_{1}")
.addParam("first", "{2}")
+ .setStrictMethodInvocation(false)
.build();
map.put("bar/*/**", config);
config = new ActionConfig.Builder("package", "eventAdd!*", "bar")
.methodName("{1}")
+ .setStrictMethodInvocation(false)
.build();
map.put("addEvent!*", config);
[2/5] struts git commit: Turns SMI on by default
Posted by lu...@apache.org.
Turns SMI on by default
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6da61ffd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6da61ffd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6da61ffd
Branch: refs/heads/master
Commit: 6da61ffdd7577ebaa43ced8189cc971519950b0b
Parents: 4ad0854
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu May 5 10:37:22 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu May 5 10:37:22 2016 +0200
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/config/entities/ActionConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6da61ffd/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index 1958f53..1b83738 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -53,7 +53,7 @@ public class ActionConfig extends Located implements Serializable {
protected String methodName;
protected String packageName;
protected String name;
- protected boolean strictMethodInvocation;
+ protected boolean strictMethodInvocation = true;
protected AllowedMethods allowedMethods;
protected ActionConfig(String packageName, String name, String className) {