Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 945EF117CD for ; Fri, 27 Jun 2014 11:23:36 +0000 (UTC) Received: (qmail 94040 invoked by uid 500); 27 Jun 2014 11:23:36 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 93969 invoked by uid 500); 27 Jun 2014 11:23:36 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 93913 invoked by uid 99); 27 Jun 2014 11:23:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jun 2014 11:23:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACF1698D6B4; Fri, 27 Jun 2014 11:23:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Fri, 27 Jun 2014 11:23:48 -0000 Message-Id: <04b4d853edef4ad4bcecd9890a835465@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] 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/WW-4295-localization 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(-) ----------------------------------------------------------------------