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 2015/01/02 20:50:44 UTC
svn commit: r1649102 -
/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
Author: sebb
Date: Fri Jan 2 19:50:44 2015
New Revision: 1649102
URL: http://svn.apache.org/r1649102
Log:
Sort existing entries
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.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=1649102&r1=1649101&r2=1649102&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 Fri Jan 2 19:50:44 2015
@@ -230,11 +230,15 @@ public class DomainValidator implements
"accountants",
"active",
"actor",
+ "adult",
"aero",
"agency",
"airforce",
"allfinanz",
"alsace",
+ "amsterdam",
+ "android",
+ "aquarelle",
"archi",
"army",
"arpa",
@@ -258,6 +262,7 @@ public class DomainValidator implements
"biz",
"black",
"blackfriday",
+ "bloomberg",
"blue",
"bmw",
"bnpparibas",
@@ -282,6 +287,7 @@ public class DomainValidator implements
"care",
"career",
"careers",
+ "cartier",
"casa",
"cash",
"cat",
@@ -302,6 +308,7 @@ public class DomainValidator implements
"clinic",
"clothing",
"club",
+ "coach",
"codes",
"coffee",
"college",
@@ -320,6 +327,7 @@ public class DomainValidator implements
"country",
"credit",
"creditcard",
+ "cricket",
"crs",
"cruises",
"cuisinella",
@@ -330,10 +338,12 @@ public class DomainValidator implements
"day",
"deals",
"degree",
+ "delivery",
"democrat",
"dental",
"dentist",
"desi",
+ "dev",
"diamonds",
"diet",
"digital",
@@ -341,34 +351,43 @@ public class DomainValidator implements
"directory",
"discount",
"dnp",
+ "docs",
"domains",
+ "doosan",
"durban",
"dvag",
"eat",
"edu",
"education",
"email",
+ "emerck",
+ "energy",
"engineer",
"engineering",
"enterprises",
"equipment",
"esq",
"estate",
+ "eurovision",
"eus",
"events",
+ "everbank",
"exchange",
"expert",
"exposed",
"fail",
"farm",
+ "fashion",
"feedback",
"finance",
"financial",
+ "firmdale",
"fish",
"fishing",
"fitness",
"flights",
"florist",
+ "flowers",
"flsmidth",
"fly",
"foo",
@@ -381,8 +400,10 @@ public class DomainValidator implements
"futbol",
"gal",
"gallery",
+ "garden",
"gbiz",
"gent",
+ "ggee",
"gift",
"gifts",
"gives",
@@ -430,6 +451,8 @@ public class DomainValidator implements
"int",
"international",
"investments",
+ "irish",
+ "iwc",
"jetzt",
"jobs",
"joburg",
@@ -443,9 +466,13 @@ public class DomainValidator implements
"kred",
"lacaixa",
"land",
+ "latrobe",
"lawyer",
+ "lds",
"lease",
+ "legal",
"lgbt",
+ "lidl",
"life",
"lighting",
"limited",
@@ -457,6 +484,7 @@ public class DomainValidator implements
"ltda",
"luxe",
"luxury",
+ "madrid",
"maison",
"management",
"mango",
@@ -466,6 +494,7 @@ public class DomainValidator implements
"meet",
"melbourne",
"meme",
+ "memorial",
"menu",
"miami",
"mil",
@@ -474,6 +503,8 @@ public class DomainValidator implements
"moda",
"moe",
"monash",
+ "money",
+ "mormon",
"mortgage",
"moscow",
"motorcycles",
@@ -499,11 +530,13 @@ public class DomainValidator implements
"ooo",
"org",
"organic",
+ "osaka",
"otsuka",
"ovh",
"paris",
"partners",
"parts",
+ "party",
"pharmacy",
"photo",
"photography",
@@ -517,6 +550,7 @@ public class DomainValidator implements
"plumbing",
"pohl",
"poker",
+ "porn",
"post",
"praxi",
"press",
@@ -535,6 +569,7 @@ public class DomainValidator implements
"rehab",
"reise",
"reisen",
+ "reit",
"ren",
"rentals",
"repair",
@@ -552,17 +587,24 @@ public class DomainValidator implements
"ruhr",
"ryukyu",
"saarland",
+ "sale",
+ "samsung",
"sarl",
"sca",
"scb",
"schmidt",
"schule",
+ "schwarz",
+ "science",
"scot",
"services",
+ "sew",
"sexy",
"shiksha",
"shoes",
+ "shriram",
"singles",
+ "sky",
"social",
"software",
"sohu",
@@ -577,7 +619,9 @@ public class DomainValidator implements
"surf",
"surgery",
"suzuki",
+ "sydney",
"systems",
+ "taipei",
"tatar",
"tattoo",
"tax",
@@ -585,6 +629,7 @@ public class DomainValidator implements
"tel",
"tienda",
"tips",
+ "tires",
"tirol",
"today",
"tokyo",
@@ -595,6 +640,7 @@ public class DomainValidator implements
"trade",
"training",
"travel",
+ "trust",
"tui",
"university",
"uno",
@@ -605,6 +651,7 @@ public class DomainValidator implements
"versicherung",
"vet",
"viajes",
+ "video",
"villas",
"vision",
"vlaanderen",
@@ -639,58 +686,8 @@ public class DomainValidator implements
"youtube",
"zip",
"zone",
- // Added Dec 30 2014
- // Taken from Version 2014123000, Last Updated Tue Dec 30 07:07:01 2014 UTC
- "adult",
- "amsterdam",
- "android",
- "aquarelle",
- "bloomberg",
- "cartier",
- "coach",
- "cricket",
- "delivery",
- "dev",
- "docs",
- "doosan",
- "emerck",
- "energy",
- "eurovision",
- "everbank",
- "fashion",
- "firmdale",
- "flowers",
- "garden",
- "ggee",
- "irish",
- "iwc",
- "latrobe",
- "lds",
- "legal",
- "lidl",
- "madrid",
- "memorial",
- "money",
- "mormon",
- "osaka",
- "party",
- "porn",
- "reit",
- "sale",
- "samsung",
- "schwarz",
- "science",
- "sew",
- "sky",
- "sydney",
- "taipei",
- "tires",
- "trust",
- "video",
"zuerich",
- // Taken from Version 2014123101, Last Updated Thu Jan 1 07:07:01 2015 UTC
- "shriram",
- };
+ };
private static final String[] COUNTRY_CODE_TLDS = new String[] {
"ac", // Ascension Island
@@ -950,8 +947,8 @@ public class DomainValidator implements
};
private static final String[] LOCAL_TLDS = new String[] {
+ "localdomain", // Also widely used as localhost.localdomain
"localhost", // RFC2606 defined
- "localdomain" // Also widely used as localhost.localdomain
};
static {