WW-4198 Merges changes to develop
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aa744b81 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aa744b81 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aa744b81 Branch: refs/heads/develop Commit: aa744b811f9c41b80cc30ad6cf41ccaa75da5323 Parents: bcd61a0 e585490 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Mar 13 18:39:15 2014 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Mar 13 18:39:15 2014 +0100 ---------------------------------------------------------------------- .../template/xhtml/form-close-validate.ftl | 2 +- .../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 +++++++++++++ 6 files changed, 112 insertions(+), 89 deletions(-) ----------------------------------------------------------------------
