Author: ivaynberg
Date: Wed Nov 23 06:43:58 2011
New Revision: 1205300
URL: http://svn.apache.org/viewvc?rev=1205300&view=rev
Log:
allow longer authorities in the url, such as "local"
Issue: WICKET-4255
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java?rev=1205300&r1=1205299&r2=1205300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/UrlValidator.java
Wed Nov 23 06:43:58 2011
@@ -427,7 +427,7 @@ public class UrlValidator implements IVa
if (segmentCount > 1)
{
String topLevel = domainSegment[segmentCount -
1];
- if (topLevel.length() < 2 || topLevel.length()
> 4)
+ if (topLevel.length() < 2)
{
return false;
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java?rev=1205300&r1=1205299&r2=1205300&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/validator/UrlValidatorTest.java
Wed Nov 23 06:43:58 2011
@@ -300,7 +300,8 @@ public class UrlValidatorTest extends Te
new ResultPair("1.2.3", false), new
ResultPair(".1.2.3.4", false),
new ResultPair("go.a", false), new ResultPair("go.a1a",
true),
new ResultPair("go.1aa", false), new ResultPair("aaa.",
false),
- new ResultPair(".aaa", false), new ResultPair("aaa",
true)
+ new ResultPair(".aaa", false), new ResultPair("aaa",
true),
+ new ResultPair("go.local", true)
/*
* , new ResultPair("", false) In combination with "http:/" + "/test1"
the expected result is
* true
