Git Push Summary
Repository: struts Updated Branches: refs/heads/hotfix/2.3.16.3 [deleted] bcffc256f
[10/50] [abbrv] git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c22146b9 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c22146b9 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c22146b9 Branch: refs/heads/feature/http-interceptor Commit: c22146b9e30a2ff6b1a6aa446d3698d31eac0835 Parents: 9519cd1 1be8ed6 Author: Lukasz Lenart Authored: Mon Apr 28 08:51:05 2014 +0200 Committer: Lukasz Lenart Committed: Mon Apr 28 08:51:05 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- .../struts2/interceptor/CookieInterceptor.java | 74 +++- core/src/main/resources/struts-default.xml | 8 +-- .../interceptor/CookieInterceptorTest.java | 66 + plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 5 +- src/site/resources/archetype-catalog.xml| 12 ++-- xwork-core/pom.xml | 2 +- .../opensymphony/xwork2/ExcludedPatterns.java | 22 ++ .../interceptor/ParametersInterceptor.java | 19 +++-- .../interceptor/ParametersInterceptorTest.java | 64 + 58 files changed, 302 insertions(+), 72 deletions(-) --
[13/50] [abbrv] git commit: Correct type with release-plugin version
Correct type with release-plugin version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dbcdbd0d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dbcdbd0d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dbcdbd0d Branch: refs/heads/feature/exclude-object-class Commit: dbcdbd0d129657ddceafbd8df36406e4bb7b7b91 Parents: 7dd83df Author: Lukasz Lenart Authored: Thu May 1 11:21:13 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 1 11:21:13 2014 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/dbcdbd0d/pom.xml -- diff --git a/pom.xml b/pom.xml index dc336c1..579ddcb 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-release-plugin -2.52 +2.5 org.apache.maven.plugins
[12/50] [abbrv] git commit: Removes version and add packaging
Removes version and add packaging Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dddb273b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dddb273b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dddb273b Branch: refs/heads/feature/http-interceptor Commit: dddb273b1db7b16c66691da49636d5cdb7d344b4 Parents: 3575beb Author: Lukasz Lenart Authored: Mon Apr 28 08:55:50 2014 +0200 Committer: Lukasz Lenart Committed: Mon Apr 28 08:55:50 2014 +0200 -- plugins/rest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/dddb273b/plugins/rest/pom.xml -- diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 66d566f..afae587 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -30,8 +30,8 @@ struts2-rest-plugin -2.3.18-SNAPSHOT Struts 2 REST Plugin +jar 1.9.2
[19/50] [abbrv] git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d35072cd Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d35072cd Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d35072cd Branch: refs/heads/feature/http-interceptor Commit: d35072cd66f48205ac7e8affdfda8e6e6b86fa04 Parents: 519aefd c9fd44f Author: Lukasz Lenart Authored: Fri May 2 14:52:50 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 14:52:50 2014 +0200 -- --
[05/10] git commit: Updates docs assembly with new location of exported pages
Updates docs assembly with new location of exported pages Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0761909c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0761909c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0761909c Branch: refs/heads/develop Commit: 0761909c65f32a0df9fc392704bf9d248bfea2c8 Parents: bca525d Author: Lukasz Lenart Authored: Fri May 2 15:47:34 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:47:34 2014 +0200 -- assembly/src/main/assembly/docs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0761909c/assembly/src/main/assembly/docs.xml -- diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 77dffcb..b1f9991 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -47,7 +47,7 @@ -target/cwiki/WW/docs +target/cwiki/ docs
[01/11] git commit: Correct type with release-plugin version
Repository: struts Updated Branches: refs/heads/feature/exclude-object-class a5946d081 -> 7857b869a refs/heads/master c9fd44fbd -> d2663cedd Correct type with release-plugin version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dbcdbd0d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dbcdbd0d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dbcdbd0d Branch: refs/heads/master Commit: dbcdbd0d129657ddceafbd8df36406e4bb7b7b91 Parents: 7dd83df Author: Lukasz Lenart Authored: Thu May 1 11:21:13 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 1 11:21:13 2014 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/dbcdbd0d/pom.xml -- diff --git a/pom.xml b/pom.xml index dc336c1..579ddcb 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-release-plugin -2.52 +2.5 org.apache.maven.plugins
[14/50] [abbrv] git commit: Correct type with release-plugin version
Correct type with release-plugin version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/dbcdbd0d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/dbcdbd0d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/dbcdbd0d Branch: refs/heads/feature/http-interceptor Commit: dbcdbd0d129657ddceafbd8df36406e4bb7b7b91 Parents: 7dd83df Author: Lukasz Lenart Authored: Thu May 1 11:21:13 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 1 11:21:13 2014 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/dbcdbd0d/pom.xml -- diff --git a/pom.xml b/pom.xml index dc336c1..579ddcb 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-release-plugin -2.52 +2.5 org.apache.maven.plugins
[46/50] [abbrv] git commit: Cleans up new extension point
Cleans up new extension point
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e8e5b51b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e8e5b51b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e8e5b51b
Branch: refs/heads/feature/exclude-object-class
Commit: e8e5b51bc64e71cc7645c1083b33e1942bf4a03d
Parents: 833a07e
Author: Lukasz Lenart
Authored: Wed May 14 08:25:00 2014 +0200
Committer: Lukasz Lenart
Committed: Wed May 14 08:25:00 2014 +0200
--
.../org/apache/struts2/config/DefaultBeanSelectionProvider.java | 4 ++--
.../java/org/apache/struts2/interceptor/CookieInterceptor.java | 2 +-
core/src/main/resources/struts-default.xml | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/e8e5b51b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
--
diff --git
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 5296b41..5c29e78 100644
---
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -390,8 +390,8 @@ public class DefaultBeanSelectionProvider extends
AbstractBeanSelectionProvider
alias(DispatcherErrorHandler.class,
StrutsConstants.STRUTS_DISPATCHER_ERROR_HANDLER, builder, props);
-/** Checker is used mostly in interceptors, so there be one instance
of checker per interceptor with Scope.REQUEST **/
-alias(ExcludedPatternsChecker.class,
StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props,
Scope.REQUEST);
+/** Checker is used mostly in interceptors, so there be one instance
of checker per interceptor with Scope.DEFAULT **/
+alias(ExcludedPatternsChecker.class,
StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props,
Scope.DEFAULT);
switchDevMode(props);
http://git-wip-us.apache.org/repos/asf/struts/blob/e8e5b51b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 8998c5c..dbe47ce 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -180,7 +180,7 @@ public class CookieInterceptor extends AbstractInterceptor {
private ExcludedPatternsChecker excludedPatternsChecker;
-@Inject(StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER)
+@Inject
public void setExcludedPatternsChecker(ExcludedPatternsChecker
excludedPatternsChecker) {
this.excludedPatternsChecker = excludedPatternsChecker;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/e8e5b51b/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 f2fb922..2d74b4f 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,9 +144,7 @@
-
-
-
+
[28/50] [abbrv] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bcffc256 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bcffc256 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bcffc256 Branch: refs/heads/feature/http-interceptor Commit: bcffc256fa27506588628a4df51977677c8d24aa Parents: e03ff72 Author: Lukasz Lenart Authored: Fri May 2 17:10:54 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:54 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index b7343c6..317a2b4 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 62c6803..1454f7b 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index c41bb76..7814520 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-mailreader http://git-wi
[39/50] [abbrv] git commit: Converts class with patterns into Struts bean
Converts class with patterns into Struts bean
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/65c023b6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/65c023b6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/65c023b6
Branch: refs/heads/feature/exclude-object-class
Commit: 65c023b6f3e848fae13135ee90c101a0d0e2f262
Parents: 08b44fd
Author: Lukasz Lenart
Authored: Mon May 12 08:26:12 2014 +0200
Committer: Lukasz Lenart
Committed: Mon May 12 08:26:12 2014 +0200
--
core/src/main/resources/struts-default.xml | 4 +
.../opensymphony/xwork2/ExcludedPatterns.java | 22 ---
.../xwork2/ExcludedPatternsChecker.java | 135 +++
3 files changed, 139 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/65c023b6/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 1f37ea2..554a8ba 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -144,6 +144,10 @@
+
+
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/65c023b6/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
deleted file mode 100644
index b618a52..000
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatterns.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.opensymphony.xwork2;
-
-/**
- * ExcludedPatterns contains hard-coded patterns that must be rejected by
{@link com.opensymphony.xwork2.interceptor.ParametersInterceptor}
- * and partially in CookInterceptor
- */
-public class ExcludedPatterns {
-
-public static final String CLASS_ACCESS_PATTERN =
"(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*";
-
-public static final String[] EXCLUDED_PATTERNS = {
-CLASS_ACCESS_PATTERN,
-"^dojo\\..*",
-"^struts\\..*",
-"^session\\..*",
-"^request\\..*",
-"^application\\..*",
-"^servlet(Request|Response)\\..*",
-"^parameters\\..*"
-};
-
-}
http://git-wip-us.apache.org/repos/asf/struts/blob/65c023b6/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
new file mode 100644
index 000..ee3eea6
--- /dev/null
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
@@ -0,0 +1,135 @@
+package com.opensymphony.xwork2;
+
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.TextParseUtil;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Used across different interceptors to check if given string matches one of
the excluded patterns.
+ * User has two options to change its behaviour:
+ * - define new set of patterns with
+ * - override this class and use then extension point
+ * to inject it in appropriated places
+ */
+public class ExcludedPatternsChecker {
+
+private static final Logger LOG =
LoggerFactory.getLogger(ExcludedPatternsChecker.class);
+
+public static final String[] EXCLUDED_PATTERNS = {
+"(.*\\.|^|.*|\\[('|\"))class(\\.|('|\")]|\\[).*",
+"^dojo\\..*",
+"^struts\\..*",
+"^session\\..*",
+"^request\\..*",
+"^application\\..*",
+"^servlet(Request|Response)\\..*",
+"^parameters\\..*"
+};
+
+private Set excludedPatterns;
+
+public ExcludedPatternsChecker() {
+excludedPatterns = new HashSet();
+for (String pattern : EXCLUDED_PATTERNS) {
+excludedPatterns.add(Pattern.compile(pattern));
+}
+}
+
+@Inject(value = XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS, required =
false)
+public void setOverrideExcludePatterns(String excludePatterns) {
+if (LOG.isWarnEnabled()) {
+LOG.warn("Overriding [#0] with [#1], be aware that this can affect
safety of your application!",
+XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS,
excludePatterns);
+
[37/50] [abbrv] git commit: Merge branch 'develop' into feature/http-interceptor
Merge branch 'develop' into feature/http-interceptor Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/de686c14 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/de686c14 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/de686c14 Branch: refs/heads/feature/http-interceptor Commit: de686c14fc7f5f70deb6f8703576c5b7b3e1ed6b Parents: b10096b 63897e8 Author: Lukasz Lenart Authored: Thu May 8 22:06:59 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 22:06:59 2014 +0200 -- .../struts2/interceptor/CookieInterceptor.java | 87 +- core/src/main/resources/struts-default.xml | 8 +- .../interceptor/CookieInterceptorTest.java | 119 +++ plugins/rest/pom.xml| 2 +- pom.xml | 3 +- src/site/resources/archetype-catalog.xml| 12 +- .../opensymphony/xwork2/ExcludedPatterns.java | 22 .../interceptor/ParametersInterceptor.java | 19 ++- .../opensymphony/xwork2/mock/MockResult.java| 2 + .../interceptor/ParametersInterceptorTest.java | 68 +++ 10 files changed, 322 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/de686c14/core/src/main/resources/struts-default.xml -- diff --cc core/src/main/resources/struts-default.xml index 5dc70ef,6e85801..73d3bc7 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@@ -262,10 -260,9 +262,10 @@@ - (.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.* + ^action:.*,^method:.* +
[34/50] [abbrv] git commit: Sets correct version in poms to match actually released version
Sets correct version in poms to match actually released version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d2663ced Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d2663ced Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d2663ced Branch: refs/heads/feature/exclude-object-class Commit: d2663cedd264a5b26bc1b12035aff7b32e138f78 Parents: 38a3f8b Author: Lukasz Lenart Authored: Thu May 8 21:57:25 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:57:25 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 99de588..f56bf90 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.4-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 283ccb4..f9e0b8c 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.4-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index fc1307a..b6281b1 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-mailreader http://gi
[48/50] [abbrv] git commit: Uses checker instead set of patterns to check if param is excluded
Uses checker instead set of patterns to check if param is excluded
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5ec47b1e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5ec47b1e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5ec47b1e
Branch: refs/heads/feature/exclude-object-class
Commit: 5ec47b1e6df6c59ff3fa466d20f28fda46b60254
Parents: 3d77c34
Author: Lukasz Lenart
Authored: Wed May 14 08:25:50 2014 +0200
Committer: Lukasz Lenart
Committed: Wed May 14 08:25:50 2014 +0200
--
.../interceptor/ParametersInterceptor.java | 43 +++-
.../interceptor/ParametersInterceptorTest.java | 4 +-
2 files changed, 16 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/5ec47b1e/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 6de6aad..460aae2 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -17,6 +17,7 @@ package com.opensymphony.xwork2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ValidationAware;
import com.opensymphony.xwork2.XWorkConstants;
import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
@@ -143,12 +144,13 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
protected static final int PARAM_NAME_MAX_LENGTH = 100;
+private ExcludedPatternsChecker excludedPatterns;
+
private int paramNameMaxLength = PARAM_NAME_MAX_LENGTH;
private boolean devMode = false;
protected boolean ordered = false;
-protected Set excludeParams = Collections.emptySet();
protected Set acceptParams = Collections.emptySet();
private ValueStackFactory valueStackFactory;
@@ -163,7 +165,12 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
devMode = "true".equalsIgnoreCase(mode);
}
- /**
+@Inject
+public void setExcludedPatterns(ExcludedPatternsChecker excludedPatterns) {
+this.excludedPatterns = excludedPatterns;
+}
+
+/**
* Sets a comma-delimited list of regular expressions to match
* parameters that are allowed in the parameter map (aka whitelist).
*
@@ -306,7 +313,7 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
//see WW-2761 for more details
MemberAccessValueStack accessValueStack = (MemberAccessValueStack)
newStack;
accessValueStack.setAcceptProperties(acceptParams);
-accessValueStack.setExcludeProperties(excludeParams);
+
accessValueStack.setExcludeProperties(excludedPatterns.getExcludedPatterns());
}
for (Map.Entry entry :
acceptableParameters.entrySet()) {
@@ -426,14 +433,10 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
}
protected boolean isExcluded(String paramName) {
-if (!this.excludeParams.isEmpty()) {
-for (Pattern pattern : excludeParams) {
-Matcher matcher = pattern.matcher(paramName);
-if (matcher.matches()) {
-notifyDeveloper("Parameter [#0] is on the excludeParams
list of patterns!", paramName);
-return true;
-}
-}
+ExcludedPatternsChecker.IsExcluded result =
excludedPatterns.isExcluded(paramName);
+if (result.isExcluded()) {
+notifyDeveloper("Parameter [#0] is on the excludeParams list of
patterns!", paramName);
+return true;
}
return false;
}
@@ -467,29 +470,13 @@ public class ParametersInterceptor extends
MethodFilterInterceptor {
}
/**
- * Gets a set of regular expressions of parameters to remove
- * from the parameter map
- *
- * @return A set of compiled regular expression patterns
- */
-protected Set getExcludeParamsSet() {
-return excludeParams;
-}
-
-/**
* Sets a comma-delimited list of regular expressions to match
* parameters that should be removed from the parameter map.
*
* @param commaDelim A comma-delimited list of regular expressions
*/
public void setExcludeParams(String commaDelim) {
-Collection excludePatterns
[42/50] [abbrv] git commit: Uses newly defined Struts bean instead duplicating logic
Uses newly defined Struts bean instead duplicating logic
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/735fd961
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/735fd961
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/735fd961
Branch: refs/heads/feature/exclude-object-class
Commit: 735fd96114413181defb17cd49aa75da232a7040
Parents: 9884c49
Author: Lukasz Lenart
Authored: Mon May 12 08:27:30 2014 +0200
Committer: Lukasz Lenart
Committed: Mon May 12 08:27:30 2014 +0200
--
.../struts2/interceptor/CookieInterceptor.java | 49
.../interceptor/CookieInterceptorTest.java | 11 +
2 files changed, 30 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/735fd961/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 340b57f..8998c5c 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -23,17 +23,18 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.ExcludedPatterns;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.util.TextParseUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
import javax.servlet.http.Cookie;
import java.util.Collections;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -176,12 +177,12 @@ public class CookieInterceptor extends
AbstractInterceptor {
// Allowed names of cookies
private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN,
Pattern.CASE_INSENSITIVE);
-private Set excludedPatterns = new HashSet();
-public CookieInterceptor() {
-for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
-excludedPatterns.add(Pattern.compile(pattern,
Pattern.CASE_INSENSITIVE));
-}
+private ExcludedPatternsChecker excludedPatternsChecker;
+
+@Inject(StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER)
+public void setExcludedPatternsChecker(ExcludedPatternsChecker
excludedPatternsChecker) {
+this.excludedPatternsChecker = excludedPatternsChecker;
}
/**
@@ -260,16 +261,7 @@ public class CookieInterceptor extends AbstractInterceptor
{
* @return true|false
*/
protected boolean isAcceptableValue(String value) {
-for (Pattern excludedPattern : excludedPatterns) {
-boolean matches = !excludedPattern.matcher(value).matches();
-if (!matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie value [#0] matches excludedPattern
[#1]", value, excludedPattern.toString());
-}
-return false;
-}
-}
-return true;
+return !isExcluded(value) && isAccepted(value);
}
/**
@@ -283,7 +275,7 @@ public class CookieInterceptor extends AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #acceptedPattern}
+ * Checks if name/value of Cookie is acceptable
*
* @param name of Cookie
* @return true|false
@@ -303,24 +295,21 @@ public class CookieInterceptor extends
AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #excludedPatterns}
+ * Checks if name/value of Cookie is excluded
*
* @param name of Cookie
* @return true|false
*/
protected boolean isExcluded(String name) {
-for (Pattern excludedPattern : excludedPatterns) {
-boolean matches = excludedPattern.matcher(name).matches();
-if (matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] matches excludedPattern [#1]",
name, excludedPattern.toString());
-}
-return true;
-} else {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] doesn't match excludedPattern
[#1]", name, excludedPattern.toString());
-}
+ExcludedPatternsChecker.IsExcl
[47/50] [abbrv] git commit: Adds additional methods needed by ParametersInterceptor
Adds additional methods needed by ParametersInterceptor
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3d77c348
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3d77c348
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3d77c348
Branch: refs/heads/feature/exclude-object-class
Commit: 3d77c348b15f438c5dcab9790daacfd4d43cd02b
Parents: e8e5b51
Author: Lukasz Lenart
Authored: Wed May 14 08:25:22 2014 +0200
Committer: Lukasz Lenart
Committed: Wed May 14 08:25:22 2014 +0200
--
.../xwork2/DefaultExcludedPatternsChecker.java | 19 +++
.../xwork2/ExcludedPatternsChecker.java | 35
2 files changed, 39 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3d77c348/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
index 3860e57..eabd621 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultExcludedPatternsChecker.java
@@ -46,29 +46,14 @@ public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
}
}
-/**
- * Allows add additional excluded patterns during runtime
- *
- * @param commaDelimitedPatterns comma delimited string with patterns
- */
public void addExcludedPatterns(String commaDelimitedPatterns) {
addExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns));
}
-/**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns array of additional excluded patterns
- */
public void addExcludedPatterns(String[] additionalPatterns) {
addExcludedPatterns(new
HashSet(Arrays.asList(additionalPatterns)));
}
-/**
- * Allows add additional excluded patterns during runtime
- *
- * @param additionalPatterns set of additional patterns
- */
public void addExcludedPatterns(Set additionalPatterns) {
if (LOG.isTraceEnabled()) {
LOG.trace("Adding additional excluded patterns [#0]",
additionalPatterns);
@@ -90,4 +75,8 @@ public class DefaultExcludedPatternsChecker implements
ExcludedPatternsChecker {
return IsExcluded.no();
}
+public Set getExcludedPatterns() {
+return excludedPatterns;
+}
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/3d77c348/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
index c4730ea..ac0ff6e 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/ExcludedPatternsChecker.java
@@ -1,5 +1,6 @@
package com.opensymphony.xwork2;
+import java.util.Set;
import java.util.regex.Pattern;
/**
@@ -7,8 +8,42 @@ import java.util.regex.Pattern;
*/
public interface ExcludedPatternsChecker {
+/**
+ * Checks if value matches any of patterns on exclude list
+ *
+ * @param value to check
+ * @return object containing result of matched pattern and pattern itself
+ */
public IsExcluded isExcluded(String value);
+/**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param commaDelimitedPatterns comma delimited string with patterns
+ */
+public void addExcludedPatterns(String commaDelimitedPatterns);
+
+/**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns array of additional excluded patterns
+ */
+public void addExcludedPatterns(String[] additionalPatterns);
+
+/**
+ * Allows add additional excluded patterns during runtime
+ *
+ * @param additionalPatterns set of additional patterns
+ */
+public void addExcludedPatterns(Set additionalPatterns);
+
+/**
+ * Allow access list of all defined excluded patterns
+ *
+ * @return set of excluded patterns
+ */
+public Set getExcludedPatterns();
+
public final static class IsExcluded {
private final boolean excluded;
[50/50] [abbrv] git commit: Updates tests to match new requirements
Updates tests to match new requirements
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/83b76b0f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/83b76b0f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/83b76b0f
Branch: refs/heads/feature/exclude-object-class
Commit: 83b76b0fe83411d93dc2c534c8c47dc53f0dca82
Parents: d1d81f8
Author: Lukasz Lenart
Authored: Wed May 14 08:26:43 2014 +0200
Committer: Lukasz Lenart
Committed: Wed May 14 08:26:43 2014 +0200
--
.../org/apache/struts2/TestConfigurationProvider.java| 5 +
xwork-core/src/test/resources/xwork-class-param-test.xml | 11 +++
2 files changed, 16 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/83b76b0f/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
--
diff --git
a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
index cd42ed5..9323f02 100644
--- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
@@ -24,6 +24,8 @@ package org.apache.struts2;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
@@ -164,5 +166,8 @@ public class TestConfigurationProvider implements
ConfigurationProvider {
if (!builder.contains(ActionProxyFactory.class)) {
builder.factory(ActionProxyFactory.class,
DefaultActionProxyFactory.class);
}
+if (!builder.contains(ExcludedPatternsChecker.class)) {
+builder.factory(ExcludedPatternsChecker.class,
DefaultExcludedPatternsChecker.class);
+}
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/83b76b0f/xwork-core/src/test/resources/xwork-class-param-test.xml
--
diff --git a/xwork-core/src/test/resources/xwork-class-param-test.xml
b/xwork-core/src/test/resources/xwork-class-param-test.xml
new file mode 100644
index 000..f12c083
--- /dev/null
+++ b/xwork-core/src/test/resources/xwork-class-param-test.xml
@@ -0,0 +1,11 @@
+http://struts.apache.org/dtds/xwork-2.0.dtd";>
+
+
+
+
+
+
+
+
\ No newline at end of file
[20/50] [abbrv] git commit: Uses wget to fetch docs instead re-exporting pages from wiki
Uses wget to fetch docs instead re-exporting pages from wiki
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/769e815c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/769e815c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/769e815c
Branch: refs/heads/feature/exclude-object-class
Commit: 769e815c6e0a72b25812ff1c4526105be9491e0c
Parents: 1a668af
Author: Lukasz Lenart
Authored: Fri May 2 15:35:31 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 15:35:31 2014 +0200
--
assembly/pom.xml | 86 +--
1 file changed, 36 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/769e815c/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7984c29..56a551b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -77,6 +77,42 @@
+maven-antrun-plugin
+
+
+cwiki-docs
+prepare-package
+
+run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://struts.apache.org/development/2.x/docs/"; />
+
+
+
+
+
+
+
+
+
+
+
+
maven-assembly-plugin
@@ -103,59 +139,9 @@
-
-
-export-cwiki
-
-
-!skipWiki
-
-
-
-
-
-org.codehaus.mojo
-exec-maven-plugin
-1.2
-
-
-cwiki-docs
-prepare-package
-
-java
-
-
-runtime
-
true
-
org.apache.cxf.cwiki.SiteExporter
-
--d
-
${project.build.directory}/cwiki/WW
--password
-
${confluence.password}
--user
-${confluence.user}
-
${basedir}/src/main/resources/docs.cfg
-
-
-
-
-
-
-
-
-
-
-org.apache.cxf.site-export
-cxf-site-export
-1.0-SNAPSHOT
-runtime
-
-
-
org.apache.struts
struts2-cdi-plugin
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache ActiveMQ Pages Page: Security edited by Dejan Bosanac [09:20 AM] (View Changes) Apache Airavata Pages Page: Registry Description and Steps (TBD) edited by Marlon Pierce [05:05 PM] (View Changes) Page: Orchestrator Description and Steps (Draft) edited by Marlon Pierce [03:15 PM] (View Changes) Apache Camel Pages Blog: Apache Camel 2.13.1 Released edited by willem jiang [07:20 AM] (View Changes) Apache Cloudstack Pages Page: API changes created by Demetrius Tsitrelis [07:15 PM] Page: 5.0 Design Documents created by Demetrius Tsitrelis [04:30 PM] Page: Templates with multiple volumes edited by prashant kumar mishra [01:05 PM] (View Changes) Page: Development Process edited by Alex Huang [09:18 AM] (View Changes) Page: Supporting Docker as a hypervisor created by Tuna [08:58 AM] Apache Curator Pages Page: TN8 created by Jordan Zimmerman [02:47 PM] Apache CXF Pages Page: Release Management edited by Daniel Kulp [07:34 PM] (View Changes) Drill Wiki Pages Page: Apache Drill Architectural Overview edited by Bridget Bevens [11:19 PM] (View Changes) Page: Connect Apache Drill to Data Sources edited by Bridget Bevens [05:51 PM] (View Changes) Apache Flume Pages Page: Status Report - May 2014 edited by Arvind Prabhakar [08:04 AM] (View Changes)
[15/50] [abbrv] git commit: Uses the same logic as in ParametersInterceptor to use st of patterns to exclude cookies which tries to access Struts internal state
Uses the same logic as in ParametersInterceptor to use st of patterns
to exclude cookies which tries to access Struts internal state
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1a668af7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1a668af7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1a668af7
Branch: refs/heads/feature/exclude-object-class
Commit: 1a668af7f1ffccea4a3b46d8d8c1fe1c7331ff02
Parents: dbcdbd0
Author: Lukasz Lenart
Authored: Thu May 1 11:31:12 2014 +0200
Committer: Lukasz Lenart
Committed: Thu May 1 11:31:12 2014 +0200
--
.../struts2/interceptor/CookieInterceptor.java | 45 +++--
.../interceptor/CookieInterceptorTest.java | 53
2 files changed, 82 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 3e2e81d..340b57f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -33,6 +33,7 @@ import org.apache.struts2.ServletActionContext;
import javax.servlet.http.Cookie;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -175,7 +176,13 @@ public class CookieInterceptor extends AbstractInterceptor
{
// Allowed names of cookies
private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN,
Pattern.CASE_INSENSITIVE);
-private Pattern excludedPattern =
Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN,
Pattern.CASE_INSENSITIVE);
+private Set excludedPatterns = new HashSet();
+
+public CookieInterceptor() {
+for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
+excludedPatterns.add(Pattern.compile(pattern,
Pattern.CASE_INSENSITIVE));
+}
+}
/**
* Set the cookiesName which if matched will allow the cookie
@@ -253,13 +260,16 @@ public class CookieInterceptor extends
AbstractInterceptor {
* @return true|false
*/
protected boolean isAcceptableValue(String value) {
-boolean matches = !excludedPattern.matcher(value).matches();
-if (!matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie value [#0] matches excludedPattern [#1]",
value, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+for (Pattern excludedPattern : excludedPatterns) {
+boolean matches = !excludedPattern.matcher(value).matches();
+if (!matches) {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie value [#0] matches excludedPattern
[#1]", value, excludedPattern.toString());
+}
+return false;
}
}
-return matches;
+return true;
}
/**
@@ -293,23 +303,26 @@ public class CookieInterceptor extends
AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #excludedPattern}
+ * Checks if name of Cookie match {@link #excludedPatterns}
*
* @param name of Cookie
* @return true|false
*/
protected boolean isExcluded(String name) {
-boolean matches = excludedPattern.matcher(name).matches();
-if (matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] matches excludedPattern [#1]", name,
ExcludedPatterns.CLASS_ACCESS_PATTERN);
-}
-} else {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]",
name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+for (Pattern excludedPattern : excludedPatterns) {
+boolean matches = excludedPattern.matcher(name).matches();
+if (matches) {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie [#0] matches excludedPattern [#1]",
name, excludedPattern.toString());
+}
+return true;
+} else {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie [#0] doesn't match excludedPattern
[#1]", name, excludedPattern.toString());
+}
}
}
-return matches;
+return false;
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
--
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Airavata Pages Page: QA Test Cases - Phase I edited by Eroma [05:52 PM] (View Changes) Page: CCGrid 2014 Airavata Tutorial - Under Construction edited by Eroma [04:32 PM] (View Changes) Page: CCGrid Tutorial Hands On created by Eroma [03:41 PM] Page: CCGrid Tutorial Agenda created by Eroma [03:39 PM] Apache Ambari Pages Page: Views edited by Jeff Sposetti [08:48 PM] (View Changes) Apache Camel Pages Page: Jetty edited by Gregor Zurowski [07:11 PM] (View Changes) Page: HTTP edited by Gregor Zurowski [07:08 PM] (View Changes) Page: HTTP4 edited by Gregor Zurowski [07:06 PM] (View Changes) Apache Cloudstack Comments Page: Test Execution for ACL/RBAC (IAM) has a new comment [ Parth Jagirdar ] Apache Hive Pages Page: HiveDeveloperFAQ edited by Lefty Leverenz [08:56 AM] (View Changes) Apache Isis Pages Page: ProjectIdeasForStudents edited by Dan Haywood [02:04 PM] (View Changes) Apache Kafka Pages Page: Kafka 0.9 Consumer Rewrite Design edited by Neha Narkhede [09:51 PM] (View Changes) Page: Powered By edited by Jay Kreps [04:49 AM] (View Changes) Page: A Guide To The Kafka Protocol edited by Joel Koshy [01:11 AM] (View Changes) Apache Solr Reference Guide Comments Page: Getting Started with SolrCloud has a new comment [ Shalin Shekhar Mangar ]
[36/50] [abbrv] git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Conflicts: apps/blank/pom.xml apps/jboss-blank/pom.xml apps/mailreader/pom.xml apps/pom.xml apps/portlet/pom.xml apps/rest-showcase/pom.xml apps/showcase/pom.xml archetypes/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/pom.xml bundles/admin/pom.xml bundles/demo/pom.xml bundles/pom.xml core/pom.xml plugins/cdi/pom.xml plugins/codebehind/pom.xml plugins/config-browser/pom.xml plugins/convention/pom.xml plugins/dojo/pom.xml plugins/dwr/pom.xml plugins/embeddedjsp/pom.xml plugins/gxp/pom.xml plugins/jasperreports/pom.xml plugins/javatemplates/pom.xml plugins/jfreechart/pom.xml plugins/jsf/pom.xml plugins/json/pom.xml plugins/junit/pom.xml plugins/osgi/pom.xml plugins/oval/pom.xml plugins/pell-multipart/pom.xml plugins/plexus/pom.xml plugins/pom.xml plugins/portlet-tiles/pom.xml plugins/portlet/pom.xml plugins/rest/pom.xml plugins/sitegraph/pom.xml plugins/sitemesh/pom.xml plugins/spring/pom.xml plugins/struts1/pom.xml plugins/testng/pom.xml plugins/tiles/pom.xml plugins/tiles3/pom.xml pom.xml xwork-core/pom.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63897e83 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63897e83 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63897e83 Branch: refs/heads/feature/http-interceptor Commit: 63897e83d98b4844982c2d96c3d20b4216ece28a Parents: 086c0a0 d2663ce Author: Lukasz Lenart Authored: Thu May 8 22:06:00 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 22:06:00 2014 +0200 -- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 2 files changed, 82 insertions(+), 16 deletions(-) --
[08/50] [abbrv] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbd75a89 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbd75a89 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbd75a89 Branch: refs/heads/feature/http-interceptor Commit: fbd75a892bdad741f8a4247e3b8e5c2727651816 Parents: 7dd83df Author: Lukasz Lenart Authored: Thu Apr 24 21:32:49 2014 +0200 Committer: Lukasz Lenart Committed: Thu Apr 24 21:32:49 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6054fc4..81a88d5 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0aebae0..b77c977 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/fbd75a89/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f2fc344..bb7ae7c 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-mailreader http://git-
[35/50] [abbrv] git commit: Merge branch 'master' into develop
Merge branch 'master' into develop Conflicts: apps/blank/pom.xml apps/jboss-blank/pom.xml apps/mailreader/pom.xml apps/pom.xml apps/portlet/pom.xml apps/rest-showcase/pom.xml apps/showcase/pom.xml archetypes/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/pom.xml bundles/admin/pom.xml bundles/demo/pom.xml bundles/pom.xml core/pom.xml plugins/cdi/pom.xml plugins/codebehind/pom.xml plugins/config-browser/pom.xml plugins/convention/pom.xml plugins/dojo/pom.xml plugins/dwr/pom.xml plugins/embeddedjsp/pom.xml plugins/gxp/pom.xml plugins/jasperreports/pom.xml plugins/javatemplates/pom.xml plugins/jfreechart/pom.xml plugins/jsf/pom.xml plugins/json/pom.xml plugins/junit/pom.xml plugins/osgi/pom.xml plugins/oval/pom.xml plugins/pell-multipart/pom.xml plugins/plexus/pom.xml plugins/pom.xml plugins/portlet-tiles/pom.xml plugins/portlet/pom.xml plugins/rest/pom.xml plugins/sitegraph/pom.xml plugins/sitemesh/pom.xml plugins/spring/pom.xml plugins/struts1/pom.xml plugins/testng/pom.xml plugins/tiles/pom.xml plugins/tiles3/pom.xml pom.xml xwork-core/pom.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63897e83 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63897e83 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63897e83 Branch: refs/heads/feature/exclude-object-class Commit: 63897e83d98b4844982c2d96c3d20b4216ece28a Parents: 086c0a0 d2663ce Author: Lukasz Lenart Authored: Thu May 8 22:06:00 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 22:06:00 2014 +0200 -- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 2 files changed, 82 insertions(+), 16 deletions(-) --
[16/50] [abbrv] git commit: Uses the same logic as in ParametersInterceptor to use st of patterns to exclude cookies which tries to access Struts internal state
Uses the same logic as in ParametersInterceptor to use st of patterns
to exclude cookies which tries to access Struts internal state
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1a668af7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1a668af7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1a668af7
Branch: refs/heads/feature/http-interceptor
Commit: 1a668af7f1ffccea4a3b46d8d8c1fe1c7331ff02
Parents: dbcdbd0
Author: Lukasz Lenart
Authored: Thu May 1 11:31:12 2014 +0200
Committer: Lukasz Lenart
Committed: Thu May 1 11:31:12 2014 +0200
--
.../struts2/interceptor/CookieInterceptor.java | 45 +++--
.../interceptor/CookieInterceptorTest.java | 53
2 files changed, 82 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
index 3e2e81d..340b57f 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
@@ -33,6 +33,7 @@ import org.apache.struts2.ServletActionContext;
import javax.servlet.http.Cookie;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -175,7 +176,13 @@ public class CookieInterceptor extends AbstractInterceptor
{
// Allowed names of cookies
private Pattern acceptedPattern = Pattern.compile(ACCEPTED_PATTERN,
Pattern.CASE_INSENSITIVE);
-private Pattern excludedPattern =
Pattern.compile(ExcludedPatterns.CLASS_ACCESS_PATTERN,
Pattern.CASE_INSENSITIVE);
+private Set excludedPatterns = new HashSet();
+
+public CookieInterceptor() {
+for (String pattern : ExcludedPatterns.EXCLUDED_PATTERNS) {
+excludedPatterns.add(Pattern.compile(pattern,
Pattern.CASE_INSENSITIVE));
+}
+}
/**
* Set the cookiesName which if matched will allow the cookie
@@ -253,13 +260,16 @@ public class CookieInterceptor extends
AbstractInterceptor {
* @return true|false
*/
protected boolean isAcceptableValue(String value) {
-boolean matches = !excludedPattern.matcher(value).matches();
-if (!matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie value [#0] matches excludedPattern [#1]",
value, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+for (Pattern excludedPattern : excludedPatterns) {
+boolean matches = !excludedPattern.matcher(value).matches();
+if (!matches) {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie value [#0] matches excludedPattern
[#1]", value, excludedPattern.toString());
+}
+return false;
}
}
-return matches;
+return true;
}
/**
@@ -293,23 +303,26 @@ public class CookieInterceptor extends
AbstractInterceptor {
}
/**
- * Checks if name of Cookie match {@link #excludedPattern}
+ * Checks if name of Cookie match {@link #excludedPatterns}
*
* @param name of Cookie
* @return true|false
*/
protected boolean isExcluded(String name) {
-boolean matches = excludedPattern.matcher(name).matches();
-if (matches) {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] matches excludedPattern [#1]", name,
ExcludedPatterns.CLASS_ACCESS_PATTERN);
-}
-} else {
-if (LOG.isTraceEnabled()) {
-LOG.trace("Cookie [#0] doesn't match excludedPattern [#1]",
name, ExcludedPatterns.CLASS_ACCESS_PATTERN);
+for (Pattern excludedPattern : excludedPatterns) {
+boolean matches = excludedPattern.matcher(name).matches();
+if (matches) {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie [#0] matches excludedPattern [#1]",
name, excludedPattern.toString());
+}
+return true;
+} else {
+if (LOG.isTraceEnabled()) {
+LOG.trace("Cookie [#0] doesn't match excludedPattern
[#1]", name, excludedPattern.toString());
+}
}
}
-return matches;
+return false;
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/1a668af7/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
--
[33/50] [abbrv] git commit: Sets correct version in poms to match actually released version
Sets correct version in poms to match actually released version Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d2663ced Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d2663ced Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d2663ced Branch: refs/heads/feature/http-interceptor Commit: d2663cedd264a5b26bc1b12035aff7b32e138f78 Parents: 38a3f8b Author: Lukasz Lenart Authored: Thu May 8 21:57:25 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:57:25 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 99de588..f56bf90 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.4-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 283ccb4..f9e0b8c 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.4-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d2663ced/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index fc1307a..b6281b1 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.4-SNAPSHOT + 2.3.16.3 struts2-mailreader http://git-wi
[43/50] [abbrv] git commit: Adds description about new extension point
Adds description about new extension point
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ba1850a1
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ba1850a1
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ba1850a1
Branch: refs/heads/feature/exclude-object-class
Commit: ba1850a1382765eb51c58103a8c5ee7c0d9417f4
Parents: 735fd96
Author: Lukasz Lenart
Authored: Tue May 13 20:28:26 2014 +0200
Committer: Lukasz Lenart
Committed: Tue May 13 20:28:26 2014 +0200
--
.../apache/struts2/config/DefaultBeanSelectionProvider.java| 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ba1850a1/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
--
diff --git
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index 5304910..5296b41 100644
---
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -313,6 +313,12 @@ import java.util.StringTokenizer;
* Used to parse expressions like ${foo.bar} or %{bar.foo} but it is
up tp the TextParser's
* implementation what kind of opening char to use (#, $, %, etc)
*
+ *
+ * com.opensymphony.xwork2.ExcludedPatternsChecker
+ * struts.excludedPatterns.checker
+ * request
+ * Used across different interceptors to check if given string matches
one of the excluded patterns
+ *
*
*
*
[26/50] [abbrv] git commit: [maven-release-plugin] prepare release STRUTS_2_3_16_3
[maven-release-plugin] prepare release STRUTS_2_3_16_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e03ff728 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e03ff728 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e03ff728 Branch: refs/heads/feature/http-interceptor Commit: e03ff728618f5bf551083fc3a52d43c07434bbc9 Parents: 0761909 Author: Lukasz Lenart Authored: Fri May 2 17:10:41 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:41 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 81a88d5..b7343c6 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index b77c977..62c6803 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index bb7ae7c..c41bb76 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-mailreader http://git-wip-us.ap
[22/50] [abbrv] git commit: Sets version in poms to -SNAPSHOT
Sets version in poms to -SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bca525da Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bca525da Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bca525da Branch: refs/heads/feature/exclude-object-class Commit: bca525da8ddf73da634b7e906254a66294293909 Parents: 769e815 Author: Lukasz Lenart Authored: Fri May 2 15:36:19 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 15:36:19 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 51 files changed, 60 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 6054fc4..81a88d5 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0aebae0..b77c977 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.2 +2.3.16.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bca525da/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f2fc344..bb7ae7c 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.2 + 2.3.16.3-SNAPSHOT struts2-mailreader http://git-wip-us.apache.org/repos/asf/
[49/50] [abbrv] git commit: Adds new dependency to allow tests pass
Adds new dependency to allow tests pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d1d81f8a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d1d81f8a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d1d81f8a
Branch: refs/heads/feature/exclude-object-class
Commit: d1d81f8a77e05ade18d67571816510d6655cee1e
Parents: 5ec47b1
Author: Lukasz Lenart
Authored: Wed May 14 08:26:27 2014 +0200
Committer: Lukasz Lenart
Committed: Wed May 14 08:26:27 2014 +0200
--
.../xwork2/config/providers/XWorkConfigurationProvider.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d1d81f8a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
index 0d48999..c341d98 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -2,9 +2,11 @@ package com.opensymphony.xwork2.config.providers;
import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.DefaultExcludedPatternsChecker;
import com.opensymphony.xwork2.DefaultLocaleProvider;
import com.opensymphony.xwork2.DefaultTextProvider;
import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.LocaleProvider;
@@ -168,7 +170,11 @@ public class XWorkConfigurationProvider implements
ConfigurationProvider {
.factory(ArrayConverter.class, Scope.SINGLETON)
.factory(DateConverter.class, Scope.SINGLETON)
.factory(NumberConverter.class, Scope.SINGLETON)
-.factory(StringConverter.class, Scope.SINGLETON);
+.factory(StringConverter.class, Scope.SINGLETON)
+
+.factory(ExcludedPatternsChecker.class,
DefaultExcludedPatternsChecker.class, Scope.DEFAULT)
+;
+
props.setProperty(XWorkConstants.DEV_MODE, Boolean.FALSE.toString());
props.setProperty(XWorkConstants.LOG_MISSING_PROPERTIES,
Boolean.FALSE.toString());
props.setProperty(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE,
Boolean.TRUE.toString());
[32/50] [abbrv] git commit: Merge branch 'hotfix/2.3.16.3'
Merge branch 'hotfix/2.3.16.3' Conflicts: apps/rest-showcase/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/src/main/assembly/docs.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/38a3f8bf Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/38a3f8bf Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/38a3f8bf Branch: refs/heads/feature/exclude-object-class Commit: 38a3f8bfb6b226db3adb44a8fc4ad0850feee54f Parents: c9fd44f bcffc25 Author: Lukasz Lenart Authored: Thu May 8 21:55:35 2014 +0200 Committer: Lukasz Lenart Committed: Thu May 8 21:55:35 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 3 +- archetypes/struts2-archetype-blank/pom.xml | 3 +- archetypes/struts2-archetype-convention/pom.xml | 3 +- archetypes/struts2-archetype-dbportlet/pom.xml | 3 +- archetypes/struts2-archetype-plugin/pom.xml | 3 +- archetypes/struts2-archetype-portlet/pom.xml| 3 +- archetypes/struts2-archetype-starter/pom.xml| 3 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- .../struts2/interceptor/CookieInterceptor.java | 45 +++-- .../interceptor/CookieInterceptorTest.java | 53 plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 53 files changed, 142 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/blank/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/jboss-blank/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/mailreader/pom.xml -- http://git-wip-us.apache.org/repos/asf/struts/blob/38a3f8bf/apps/pom.xml -- diff --cc apps/pom.xml index ac06753,d0a24d0..5860c18 --- a/apps/pom.xml +++ b/apps/pom.xml @@@ -26,11 -26,12 +26,11 @@@
[29/50] [abbrv] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bcffc256 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bcffc256 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bcffc256 Branch: refs/heads/feature/exclude-object-class Commit: bcffc256fa27506588628a4df51977677c8d24aa Parents: e03ff72 Author: Lukasz Lenart Authored: Fri May 2 17:10:54 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:54 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index b7343c6..317a2b4 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 62c6803..1454f7b 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index c41bb76..7814520 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-mailreader http://gi
[06/10] git commit: [maven-release-plugin] prepare release STRUTS_2_3_16_3
[maven-release-plugin] prepare release STRUTS_2_3_16_3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e03ff728 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e03ff728 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e03ff728 Branch: refs/heads/develop Commit: e03ff728618f5bf551083fc3a52d43c07434bbc9 Parents: 0761909 Author: Lukasz Lenart Authored: Fri May 2 17:10:41 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:41 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 81a88d5..b7343c6 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index b77c977..62c6803 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3-SNAPSHOT +2.3.16.3 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/e03ff728/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index bb7ae7c..c41bb76 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3-SNAPSHOT + 2.3.16.3 struts2-mailreader http://git-wip-us.apache.org/repos/as
[17/50] [abbrv] git commit: Overrides pattern exclusion initialisation to allow test to pass
Overrides pattern exclusion initialisation to allow test to pass
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/519aefdc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/519aefdc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/519aefdc
Branch: refs/heads/feature/http-interceptor
Commit: 519aefdc86add277a16e46d235328791d910177c
Parents: dddb273
Author: Lukasz Lenart
Authored: Fri May 2 14:50:34 2014 +0200
Committer: Lukasz Lenart
Committed: Fri May 2 14:50:34 2014 +0200
--
.../xwork2/interceptor/ParametersInterceptorTest.java| 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/519aefdc/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
index 4414666..7084924 100644
---
a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
+++
b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java
@@ -183,6 +183,10 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
return result;
}
+@Override
+protected void initializeHardCodedExcludePatterns() {
+excludeParams = new HashSet();
+}
};
container.inject(pi);
[40/50] [abbrv] git commit: Defines new extension point
Defines new extension point
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4577e5ee
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4577e5ee
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4577e5ee
Branch: refs/heads/feature/exclude-object-class
Commit: 4577e5eefb057e80bbdd740b0c56120c15469827
Parents: 65c023b
Author: Lukasz Lenart
Authored: Mon May 12 08:26:33 2014 +0200
Committer: Lukasz Lenart
Committed: Mon May 12 08:26:33 2014 +0200
--
core/src/main/java/org/apache/struts2/StrutsConstants.java| 6 ++
.../apache/struts2/config/DefaultBeanSelectionProvider.java | 7 ++-
.../src/main/java/com/opensymphony/xwork2/XWorkConstants.java | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/4577e5ee/core/src/main/java/org/apache/struts2/StrutsConstants.java
--
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index d508373..d173add 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -285,4 +285,10 @@ public final class StrutsConstants {
/** Comma delimited set of excluded classes which cannot be accessed via
expressions **/
public static final String STRUTS_EXCLUDED_CLASSES =
"struts.excludedClasses";
+/** Dedicated service to check if passed string is excluded or not **/
+public static final String STRUTS_EXCLUDED_PATTERNS_CHECKER =
"struts.excludedPatterns.checker";
+
+/** Constant is used to override framework's default excluded patterns **/
+public static final String STRUTS_OVERRIDE_EXCLUDED_PATTERNS =
"struts.override.excludedPatterns";
+
}
http://git-wip-us.apache.org/repos/asf/struts/blob/4577e5ee/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
--
diff --git
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index dedbce5..5304910 100644
---
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -22,6 +22,7 @@
package org.apache.struts2.config;
import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ExcludedPatternsChecker;
import com.opensymphony.xwork2.FileManager;
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.LocaleProvider;
@@ -343,7 +344,7 @@ public class DefaultBeanSelectionProvider extends
AbstractBeanSelectionProvider
alias(ResultFactory.class,
StrutsConstants.STRUTS_OBJECTFACTORY_RESULTFACTORY, builder, props);
alias(ConverterFactory.class,
StrutsConstants.STRUTS_OBJECTFACTORY_CONVERTERFACTORY, builder, props);
alias(InterceptorFactory.class,
StrutsConstants.STRUTS_OBJECTFACTORY_INTERCEPTORFACTORY, builder, props);
-alias(ValidatorFactory.class,
StrutsConstants.STRUTS_OBJECTFACTORY_INTERCEPTORFACTORY, builder, props);
+alias(ValidatorFactory.class,
StrutsConstants.STRUTS_OBJECTFACTORY_VALIDATORFACTORY, builder, props);
alias(FileManagerFactory.class,
StrutsConstants.STRUTS_FILE_MANAGER_FACTORY, builder, props, Scope.SINGLETON);
@@ -383,6 +384,9 @@ public class DefaultBeanSelectionProvider extends
AbstractBeanSelectionProvider
alias(DispatcherErrorHandler.class,
StrutsConstants.STRUTS_DISPATCHER_ERROR_HANDLER, builder, props);
+/** Checker is used mostly in interceptors, so there be one instance
of checker per interceptor with Scope.REQUEST **/
+alias(ExcludedPatternsChecker.class,
StrutsConstants.STRUTS_EXCLUDED_PATTERNS_CHECKER, builder, props,
Scope.REQUEST);
+
switchDevMode(props);
// Convert Struts properties into XWork properties
@@ -392,6 +396,7 @@ public class DefaultBeanSelectionProvider extends
AbstractBeanSelectionProvider
convertIfExist(props,
StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS,
XWorkConstants.ALLOW_STATIC_METHOD_ACCESS);
convertIfExist(props, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD,
XWorkConstants.RELOAD_XML_CONFIGURATION);
convertIfExist(props, StrutsConstants.STRUTS_EXCLUDED_CLASSES,
XWorkConstants.OGNL_EXCLUDED_CLASSES);
+convertIfExist(props,
StrutsConstants.STRUTS_OVERRIDE_EXCLUDED_PATTERNS,
XWorkConstants.OVERRIDE_EXCLUDED_PATTERNS);
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
l
[07/10] git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bcffc256 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bcffc256 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bcffc256 Branch: refs/heads/develop Commit: bcffc256fa27506588628a4df51977677c8d24aa Parents: e03ff72 Author: Lukasz Lenart Authored: Fri May 2 17:10:54 2014 +0200 Committer: Lukasz Lenart Committed: Fri May 2 17:10:54 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 4 ++-- archetypes/struts2-archetype-blank/pom.xml | 4 ++-- archetypes/struts2-archetype-convention/pom.xml | 4 ++-- archetypes/struts2-archetype-dbportlet/pom.xml | 4 ++-- archetypes/struts2-archetype-plugin/pom.xml | 4 ++-- archetypes/struts2-archetype-portlet/pom.xml| 4 ++-- archetypes/struts2-archetype-starter/pom.xml| 4 ++-- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 ++-- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 4 ++-- xwork-core/pom.xml | 2 +- 51 files changed, 61 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index b7343c6..317a2b4 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 62c6803..1454f7b 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.16.3 +2.3.16.4-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/bcffc256/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index c41bb76..7814520 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.16.3 + 2.3.16.4-SNAPSHOT struts2-mailreader http://git-wip-us.apache.org/r
[09/50] [abbrv] git commit: Merge branch 'hotfix/2.3.16.2'
Merge branch 'hotfix/2.3.16.2' Conflicts: apps/blank/pom.xml apps/jboss-blank/pom.xml apps/mailreader/pom.xml apps/pom.xml apps/portlet/pom.xml apps/rest-showcase/pom.xml apps/showcase/pom.xml archetypes/pom.xml archetypes/struts2-archetype-angularjs/pom.xml archetypes/struts2-archetype-blank/pom.xml archetypes/struts2-archetype-convention/pom.xml archetypes/struts2-archetype-dbportlet/pom.xml archetypes/struts2-archetype-plugin/pom.xml archetypes/struts2-archetype-portlet/pom.xml archetypes/struts2-archetype-starter/pom.xml assembly/pom.xml bundles/admin/pom.xml bundles/demo/pom.xml bundles/pom.xml core/pom.xml core/src/main/resources/struts-default.xml plugins/cdi/pom.xml plugins/codebehind/pom.xml plugins/config-browser/pom.xml plugins/convention/pom.xml plugins/dojo/pom.xml plugins/dwr/pom.xml plugins/embeddedjsp/pom.xml plugins/gxp/pom.xml plugins/jasperreports/pom.xml plugins/javatemplates/pom.xml plugins/jfreechart/pom.xml plugins/jsf/pom.xml plugins/json/pom.xml plugins/junit/pom.xml plugins/osgi/pom.xml plugins/oval/pom.xml plugins/pell-multipart/pom.xml plugins/plexus/pom.xml plugins/pom.xml plugins/portlet-tiles/pom.xml plugins/portlet/pom.xml plugins/rest/pom.xml plugins/sitegraph/pom.xml plugins/sitemesh/pom.xml plugins/spring/pom.xml plugins/struts1/pom.xml plugins/testng/pom.xml plugins/tiles/pom.xml plugins/tiles3/pom.xml pom.xml xwork-core/pom.xml Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1be8ed61 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1be8ed61 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1be8ed61 Branch: refs/heads/feature/http-interceptor Commit: 1be8ed61e499b58b3fb6a45253f47865f83f35fb Parents: 6d55d01 fbd75a8 Author: Lukasz Lenart Authored: Mon Apr 28 08:50:53 2014 +0200 Committer: Lukasz Lenart Committed: Mon Apr 28 08:50:53 2014 +0200 -- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml| 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml| 2 +- apps/portlet/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 +- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml| 2 +- archetypes/struts2-archetype-starter/pom.xml| 2 +- assembly/pom.xml| 2 +- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- .../struts2/interceptor/CookieInterceptor.java | 74 +++- core/src/main/resources/struts-default.xml | 8 +-- .../interceptor/CookieInterceptorTest.java | 66 + plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml| 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 4 +- plugins/
