Merge branch 'develop' into feature/exclude-object-class
Conflicts:
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5946d08
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5946d08
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5946d08
Branch: refs/heads/feature/WW-4295-localization
Commit: a5946d0814b6245f1e83e4ff8e5f337b045991ae
Parents: ba0ac0d 086c0a0
Author: Lukasz Lenart <[email protected]>
Authored: Mon May 5 06:43:31 2014 +0200
Committer: Lukasz Lenart <[email protected]>
Committed: Mon May 5 06:43:31 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 74 +++++++++++++++++++-
core/src/main/resources/struts-default.xml | 8 +--
.../interceptor/CookieInterceptorTest.java | 66 +++++++++++++++++
plugins/rest/pom.xml | 2 +-
pom.xml | 3 +-
src/site/resources/archetype-catalog.xml | 12 ++--
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ++++++
.../interceptor/ParametersInterceptor.java | 2 +-
.../opensymphony/xwork2/mock/MockResult.java | 2 +
.../interceptor/ParametersInterceptorTest.java | 68 ++++++++++++++++++
10 files changed, 242 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
----------------------------------------------------------------------
diff --cc
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index e09ab54,c73b057..6de6aad
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@@ -485,9 -507,8 +485,9 @@@ public class ParametersInterceptor exte
public void setExcludeParams(String commaDelim) {
Collection<String> excludePatterns =
ArrayUtils.asCollection(commaDelim);
if (excludePatterns != null) {
+ excludeParams = new HashSet<Pattern>();
for (String pattern : excludePatterns) {
- excludeParams.add(Pattern.compile(pattern));
+ excludeParams.add(Pattern.compile(pattern,
Pattern.CASE_INSENSITIVE));
}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a5946d08/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
----------------------------------------------------------------------
