You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/03/19 20:50:08 UTC
[14/16] git commit: Merge branch 'develop' into
feature/WW-4267-removes-defaults
Merge branch 'develop' into feature/WW-4267-removes-defaults
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bd2a5ea8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bd2a5ea8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bd2a5ea8
Branch: refs/heads/develop
Commit: bd2a5ea8d5f5dc6468f4883c0768066f4e721fe1
Parents: f2b5261 ae12bd7
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Mar 19 20:41:16 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Mar 19 20:41:16 2014 +0100
----------------------------------------------------------------------
.../struts2/components/GenericUIBean.java | 5 +--
.../org/apache/struts2/components/Hidden.java | 7 ++++
.../org/apache/struts2/components/UIBean.java | 9 ++++-
.../dispatcher/ServletRedirectResult.java | 42 ++++++++++++++++----
.../main/resources/template/xhtml/hidden.ftl | 27 +++++++++++++
.../apache/struts2/StrutsInternalTestCase.java | 9 ++---
.../struts2/views/jsp/AbstractTagTest.java | 4 +-
.../apache/struts2/views/jsp/ui/Hidden-1.txt | 6 ++-
.../apache/struts2/views/jsp/ui/Hidden-2.txt | 6 ++-
9 files changed, 93 insertions(+), 22 deletions(-)
----------------------------------------------------------------------