You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/12/31 14:06:45 UTC

svn commit: r1648691 - in /commons/proper/validator/trunk/src: main/java/org/apache/commons/validator/routines/DomainValidator.java test/java/org/apache/commons/validator/routines/DomainValidatorTest.java

Author: sebb
Date: Wed Dec 31 13:06:45 2014
New Revision: 1648691

URL: http://svn.apache.org/r1648691
Log:
VALIDATOR-348 Update TLD list to latest version (Version 2014123000)
Exclude XN-- (Punycode) TLDs

Modified:
    commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
    commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java

Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java?rev=1648691&r1=1648690&r2=1648691&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java Wed Dec 31 13:06:45 2014
@@ -681,105 +681,8 @@ public class DomainValidator implements
         "tires",
         "trust",
         "video",
-        "xn--1qqw23a",
-        "xn--3bst00m",
-        "xn--3ds443g",
-        "xn--3e0b707e",
-        "xn--45brj9c",
-        "xn--45q11c",
-        "xn--4gbrim",
-        "xn--55qw42g",
-        "xn--55qx5d",
-        "xn--6frz82g",
-        "xn--6qq986b3xl",
-        "xn--80adxhks",
-        "xn--80ao21a",
-        "xn--80asehdb",
-        "xn--80aswg",
-        "xn--90a3ac",
-        "xn--c1avg",
-        "xn--cg4bki",
-        "xn--clchc0ea0b2g2a9gcd",
-        "xn--czr694b",
-        "xn--czrs0t",
-        "xn--czru2d",
-        "xn--d1acj3b",
-        "xn--d1alf",
-        "xn--fiq228c5hs",
-        "xn--fiq64b",
-        "xn--fiqs8s",
-        "xn--fiqz9s",
-        "xn--flw351e",
-        "xn--fpcrj9c3d",
-        "xn--fzc2c9e2c",
-        "xn--gecrj9c",
-        "xn--h2brj9c",
-        "xn--hxt814e",
-        "xn--i1b6b1a6a2e",
-        "xn--io0a7i",
-        "xn--j1amh",
-        "xn--j6w193g",
-        "xn--kprw13d",
-        "xn--kpry57d",
-        "xn--kput3i",
-        "xn--l1acc",
-        "xn--lgbbat1ad8j",
-        "xn--mgb9awbf",
-        "xn--mgba3a4f16a",
-        "xn--mgbaam7a8h",
-        "xn--mgbab2bd",
-        "xn--mgbayh7gpa",
-        "xn--mgbbh1a71e",
-        "xn--mgbc0a9azcg",
-        "xn--mgberp4a5d4ar",
-        "xn--mgbx4cd0ab",
-        "xn--ngbc5azd",
-        "xn--node",
-        "xn--nqv7f",
-        "xn--nqv7fs00ema",
-        "xn--o3cw4h",
-        "xn--ogbpf8fl",
-        "xn--p1acf",
-        "xn--p1ai",
-        "xn--pgbs0dh",
-        "xn--q9jyb4c",
-        "xn--qcka1pmc",
-        "xn--rhqv96g",
-        "xn--s9brj9c",
-        "xn--ses554g",
-        "xn--unup4y",
-        "xn--vermgensberater-ctb",
-        "xn--vermgensberatung-pwb",
-        "xn--vhquv",
-        "xn--wgbh1c",
-        "xn--wgbl6a",
-        "xn--xhq521b",
-        "xn--xkc2al3hye2a",
-        "xn--xkc2dl3a5ee0h",
-        "xn--yfro4i67o",
-        "xn--ygbi2ammx",
-        "xn--zfr164b",
         "zuerich",
         "9c",
-        "xn--45q11c",
-        "xn--4gbrim",
-        "xn--55qw42g",
-        "xn--55qx5d",
-        "xn--6frz82g",
-        "xn--6qq986b3xl",
-        "xn--80adxhks",
-        "xn--80ao21a",
-        "xn--80asehdb",
-        "xn--80aswg",
-        "xn--90a3ac",
-        "xn--c1avg",
-        "xn--cg4bki",
-        "xn--clchc0ea0b2g2a9gcd",
-        "xn--czr694b",
-        "xn--czrs0t",
-        "xn--czru2d",
-        "xn--d1acj3b",
-        "xn--d1a",
     };
 
     private static final String[] COUNTRY_CODE_TLDS = new String[] {

Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java?rev=1648691&r1=1648690&r2=1648691&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java Wed Dec 31 13:06:45 2014
@@ -143,7 +143,7 @@ public class DomainValidatorTest extends
         System.out.println("Entries missing from TLD List\n");
         String line;
         while((line = br.readLine()) != null) {
-            if (!line.startsWith("#")) {
+            if (!line.startsWith("#") && !line.startsWith("XN--")) {
                 if (!dv.isValidTld(line)) {
                     System.out.println("        \""+line.toLowerCase(Locale.ENGLISH)+"\",");
                 }