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 <lukaszlen...@apache.org> Authored: Thu May 8 22:06:59 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> 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 @@@ <interceptor-ref name="datetime"/> <interceptor-ref name="multiselect"/> <interceptor-ref name="params"> - <param name="excludeParams">(.*\.|^)class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param> + <param name="excludeParams">^action:.*,^method:.*</param> </interceptor-ref> <interceptor-ref name="servletConfig"/> + <interceptor-ref name="httpMethod"/> <interceptor-ref name="prepare"/> <interceptor-ref name="chain"/> <interceptor-ref name="modelDriven"/>
