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/21 21:16:01 UTC
[22/22] git commit: Merge branch 'develop' into
feature/use-js-to-support-multiple-buttons
Merge branch 'develop' into feature/use-js-to-support-multiple-buttons
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/342a89e9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/342a89e9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/342a89e9
Branch: refs/heads/feature/use-js-to-support-multiple-buttons
Commit: 342a89e99a062d49bbb9b1a7a86df4ad51992ac5
Parents: 9ffd041 4fbfa3b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 20 22:00:01 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 20 22:00:01 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 +++++++++--
.../org/apache/struts2/default.properties | 6 +-
.../template/xhtml/form-close-validate.ftl | 2 +-
.../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 +-
.../com/opensymphony/xwork2/util/URLUtil.java | 1 +
...nnotationValidationConfigurationBuilder.java | 6 ++
.../validator/annotations/UrlValidator.java | 76 +++-----------------
.../validator/validators/URLValidator.java | 66 +++++++++++------
.../xwork2/validator/URLValidatorTest.java | 50 +++++++++++++
16 files changed, 208 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/342a89e9/core/src/main/resources/org/apache/struts2/default.properties
----------------------------------------------------------------------