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 <lukaszlen...@apache.org> Authored: Mon Apr 28 08:51:05 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> 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(-) ----------------------------------------------------------------------
