Merge branch 'develop' into feature/WW-4187-correctly-identify-protocols
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3c1d25c0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3c1d25c0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3c1d25c0 Branch: refs/heads/master Commit: 3c1d25c04f1d1a65fca15d1c2de062dd1ae54f34 Parents: d59fb2b 561063a Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Mar 19 08:52:14 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Mar 19 08:52:14 2014 +0100 ---------------------------------------------------------------------- .../struts2/components/GenericUIBean.java | 5 +- .../org/apache/struts2/components/Hidden.java | 7 ++ .../org/apache/struts2/components/UIBean.java | 9 ++- .../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 +++++++++++++ 14 files changed, 170 insertions(+), 104 deletions(-) ----------------------------------------------------------------------
