Author: sebb Date: Sat Feb 4 12:25:03 2017 New Revision: 1781663 URL: http://svn.apache.org/viewvc?rev=1781663&view=rev Log: Updated to Version 2017020400, Last Updated Sat Feb 4 07:07:01 2017 UTC
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=1781663&r1=1781662&r2=1781663&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 Sat Feb 4 12:25:03 2017 @@ -283,7 +283,7 @@ public class DomainValidator implements // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search private static final String[] GENERIC_TLDS = new String[] { - // Taken from Version 2016082201, Last Updated Tue Aug 23 07:07:02 2016 UTC + // Taken from Version 2017020400, Last Updated Sat Feb 4 07:07:01 2017 UTC "aaa", // aaa American Automobile Association, Inc. "aarp", // aarp AARP "abarth", // abarth Fiat Chrysler Automobiles N.V. @@ -335,6 +335,7 @@ public class DomainValidator implements "android", // android Charleston Road Registry Inc. "anquan", // anquan QIHOO 360 TECHNOLOGY CO. LTD. "anz", // anz Australia and New Zealand Banking Group Limited + "aol", // aol AOL Inc. "apartments", // apartments June Maple, LLC "app", // app Charleston Road Registry Inc. "apple", // apple Apple Inc. @@ -373,6 +374,8 @@ public class DomainValidator implements "barclays", // barclays Barclays Bank PLC "barefoot", // barefoot Gallo Vineyards, Inc. "bargains", // bargains Half Hallow, LLC + "baseball", // baseball MLB Advanced Media DH, LLC + "basketball", // basketball Fédération Internationale de Basketball (FIBA) "bauhaus", // bauhaus Werkhaus GmbH "bayern", // bayern Bayern Connect GmbH "bbc", // bbc British Broadcasting Corporation @@ -418,8 +421,10 @@ public class DomainValidator implements "boots", // boots THE BOOTS COMPANY PLC "bosch", // bosch Robert Bosch GMBH "bostik", // bostik Bostik SA + "boston", // boston Boston TLD Management, LLC "bot", // bot Amazon Registry Services, Inc. "boutique", // boutique Over Galley, LLC + "box", // box NS1 Limited "bradesco", // bradesco Banco Bradesco S.A. "bridgestone", // bridgestone Bridgestone Corporation "broadway", // broadway Celebrate Broadway, Inc. @@ -456,10 +461,13 @@ public class DomainValidator implements "cars", // cars Uniregistry, Corp. "cartier", // cartier Richemont DNS Inc. "casa", // casa Top Level Domain Holdings Limited + "case", // case CNH Industrial N.V. + "caseih", // caseih CNH Industrial N.V. "cash", // cash Delta Lake, LLC "casino", // casino Binky Sky, LLC "cat", // cat Fundacio puntCAT "catering", // catering New Falls. LLC + "catholic", // catholic Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication) "cba", // cba COMMONWEALTH BANK OF AUSTRALIA "cbn", // cbn The Christian Broadcasting Network, Inc. "cbre", // cbre CBRE, Inc. @@ -531,6 +539,7 @@ public class DomainValidator implements "cricket", // cricket dot Cricket Limited "crown", // crown Crown Equipment Corporation "crs", // crs Federated Co-operatives Limited + "cruise", // cruise Viking River Cruises (Bermuda) Ltd. "cruises", // cruises Spring Way, LLC "csc", // csc Alliance-One Services, Inc. "cuisinella", // cuisinella SALM S.A.S. @@ -539,6 +548,7 @@ public class DomainValidator implements "dabur", // dabur Dabur India Limited "dad", // dad Charleston Road Registry Inc. "dance", // dance United TLD Holdco Ltd. + "data", // data Dish DBS Corporation "date", // date dot Date Limited "dating", // dating Pine Fest, LLC "datsun", // datsun NISSAN MOTOR CO., LTD. @@ -568,6 +578,7 @@ public class DomainValidator implements "discount", // discount Holly Hill, LLC "discover", // discover Discover Financial Services "dish", // dish Dish DBS Corporation + "diy", // diy Lifestyle Domain Holdings, Inc. "dnp", // dnp Dai Nippon Printing Co., Ltd. "docs", // docs Charleston Road Registry Inc. "doctor", // doctor Brice Trail, LLC @@ -587,8 +598,10 @@ public class DomainValidator implements "dupont", // dupont E. I. du Pont de Nemours and Company "durban", // durban ZA Central Registry NPC trading as ZA Central Registry "dvag", // dvag Deutsche Vermögensberatung Aktiengesellschaft DVAG + "dvr", // dvr Hughes Satellite Systems Corporation "earth", // earth Interlink Co., Ltd. "eat", // eat Charleston Road Registry Inc. + "eco", // eco Big Room Inc. "edeka", // edeka EDEKA Verband kaufmännischer Genossenschaften e.V. "edu", // edu EDUCAUSE "education", // education Brice Way, LLC @@ -632,6 +645,7 @@ public class DomainValidator implements "ferrero", // ferrero Ferrero Trading Lux S.A. "fiat", // fiat Fiat Chrysler Automobiles N.V. "fidelity", // fidelity Fidelity Brokerage Services LLC + "fido", // fido Rogers Communications Canada Inc. "film", // film Motion Picture Domain Registry Pty Ltd "final", // final Núcleo de Informação e Coordenação do Ponto BR - NIC.br "finance", // finance Cotton Cypress, LLC @@ -651,6 +665,7 @@ public class DomainValidator implements // "flsmidth", // flsmidth FLSmidth A/S retired 2016-07-22 "fly", // fly Charleston Road Registry Inc. "foo", // foo Charleston Road Registry Inc. + "food", // food Lifestyle Domain Holdings, Inc. "foodnetwork", // foodnetwork Lifestyle Domain Holdings, Inc. "football", // football Foggy Farms, LLC "ford", // ford Ford Motor Company @@ -659,6 +674,7 @@ public class DomainValidator implements "forum", // forum Fegistry, LLC "foundation", // foundation John Dale, LLC "fox", // fox FOX Registry, LLC + "free", // free Amazon Registry Services, Inc. "fresenius", // fresenius Fresenius Immobilien-Verwaltungs-GmbH "frl", // frl FRLregistry B.V. "frogans", // frogans OP3FT @@ -667,6 +683,7 @@ public class DomainValidator implements "ftr", // ftr Frontier Communications Corporation "fujitsu", // fujitsu Fujitsu Limited "fujixerox", // fujixerox Xerox DNHC LLC + "fun", // fun DotSpace, Inc. "fund", // fund John Castle, LLC "furniture", // furniture Lone Fields, LLC "futbol", // futbol United TLD Holdco, Ltd. @@ -723,6 +740,7 @@ public class DomainValidator implements "guide", // guide Snow Moon, LLC "guitars", // guitars Uniregistry, Corp. "guru", // guru Pioneer Cypress, LLC + "hair", // hair L'Oreal "hamburg", // hamburg Hamburg Top-Level-Domain GmbH "hangout", // hangout Charleston Road Registry Inc. "haus", // haus United TLD Holdco, LTD. @@ -751,6 +769,7 @@ public class DomainValidator implements "honda", // honda Honda Motor Co., Ltd. "honeywell", // honeywell Honeywell GTLD LLC "horse", // horse Top Level Domain Holdings Limited + "hospital", // hospital Ruby Pike, LLC "host", // host DotHost Inc. "hosting", // hosting Uniregistry, Corp. "hot", // hot Amazon Registry Services, Inc. @@ -769,7 +788,7 @@ public class DomainValidator implements "icu", // icu One.com A/S "ieee", // ieee IEEE Global LLC "ifm", // ifm ifm electronic gmbh - "iinet", // iinet Connect West Pty. Ltd. +// "iinet", // iinet Connect West Pty. Ltd. (Retired) "ikano", // ikano Ikano S.A. "imamat", // imamat Fondation Aga Khan (Aga Khan Foundation) "imdb", // imdb Amazon Registry Services, Inc. @@ -796,6 +815,7 @@ public class DomainValidator implements "istanbul", // istanbul Istanbul Metropolitan Municipality / Medya A.S. "itau", // itau Itau Unibanco Holding S.A. "itv", // itv ITV Services Limited + "iveco", // iveco CNH Industrial N.V. "iwc", // iwc Richemont DNS Inc. "jaguar", // jaguar Jaguar Land Rover Ltd "java", // java Oracle Corporation @@ -804,6 +824,7 @@ public class DomainValidator implements "jeep", // jeep FCA US LLC. "jetzt", // jetzt New TLD Company AB "jewelry", // jewelry Wild Bloom, LLC + "jio", // jio Affinity Names, Inc. "jlc", // jlc Richemont DNS Inc. "jll", // jll Jones Lang LaSalle Incorporated "jmp", // jmp Matrix IP LLC @@ -936,6 +957,7 @@ public class DomainValidator implements "mls", // mls The Canadian Real Estate Association "mma", // mma MMA IARD "mobi", // mobi Afilias Technologies Limited dba dotMobi + "mobile", // mobile Dish DBS Corporation "mobily", // mobily GreenTech Consultancy Company W.L.L. "moda", // moda United TLD Holdco Ltd. "moe", // moe Interlink Co., Ltd. @@ -943,11 +965,13 @@ public class DomainValidator implements "mom", // mom Uniregistry, Corp. "monash", // monash Monash University "money", // money Outer McCook, LLC + "monster", // monster Monster Worldwide, Inc. "montblanc", // montblanc Richemont DNS Inc. "mopar", // mopar FCA US LLC. "mormon", // mormon IRI Domain Management, LLC ("Applicant") "mortgage", // mortgage United TLD Holdco, Ltd "moscow", // moscow Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) + "moto", // moto Motorola Trademark Holdings, LLC "motorcycles", // motorcycles DERMotorcycles, LLC "mov", // mov Charleston Road Registry Inc. "movie", // movie New Frostbite, LLC @@ -958,7 +982,7 @@ public class DomainValidator implements "mtr", // mtr MTR Corporation Limited "museum", // museum Museum Domain Management Association "mutual", // mutual Northwestern Mutual MU TLD Registry, LLC - "mutuelle", // mutuelle Fédération Nationale de la Mutualité Française +// "mutuelle", // mutuelle Fédération Nationale de la Mutualité Française (Retired) "nab", // nab National Australia Bank Limited "nadex", // nadex Nadex Domains, Inc "nagoya", // nagoya GMO Registry, Inc. @@ -974,6 +998,7 @@ public class DomainValidator implements "network", // network Trixy Manor, LLC "neustar", // neustar NeuStar, Inc. "new", // new Charleston Road Registry Inc. + "newholland", // newholland CNH Industrial N.V. "news", // news United TLD Holdco Ltd. "next", // next Next plc "nextdirect", // nextdirect Next plc @@ -998,6 +1023,7 @@ public class DomainValidator implements "ntt", // ntt NIPPON TELEGRAPH AND TELEPHONE CORPORATION "nyc", // nyc The City of New York by and through the New York City Department of Information Technology & Telecommunications "obi", // obi OBI Group Holding SE & Co. KGaA + "observer", // observer Top Level Spectrum, Inc. "off", // off Johnson Shareholdings, Inc. "office", // office Microsoft Corporation "okinawa", // okinawa BusinessRalliart inc. @@ -1039,6 +1065,7 @@ public class DomainValidator implements "pfizer", // pfizer Pfizer Inc. "pharmacy", // pharmacy National Association of Boards of Pharmacy "philips", // philips Koninklijke Philips N.V. + "phone", // phone Dish DBS Corporation "photo", // photo Uniregistry, Corp. "photography", // photography Sugar Glen, LLC "photos", // photos Sea Corner, LLC @@ -1086,6 +1113,7 @@ public class DomainValidator implements "quest", // quest Quest ION Limited "qvc", // qvc QVC, Inc. "racing", // racing Premier Registry Limited + "radio", // radio European Broadcasting Union (EBU) "raid", // raid Johnson Shareholdings, Inc. "read", // read Amazon Registry Services, Inc. "realestate", // realestate dotRealEstate LLC @@ -1099,6 +1127,7 @@ public class DomainValidator implements "reise", // reise Foggy Way, LLC "reisen", // reisen New Cypress, LLC "reit", // reit National Association of Real Estate Investment Trusts, Inc. + "reliance", // reliance Reliance Industries Limited "ren", // ren Beijing Qianxiang Wangjing Technology Development Co., Ltd. "rent", // rent XYZ.COM LLC "rentals", // rentals Big Hollow,LLC @@ -1114,11 +1143,14 @@ public class DomainValidator implements "richardli", // richardli Pacific Century Asset Management (HK) Limited "ricoh", // ricoh Ricoh Company, Ltd. "rightathome", // rightathome Johnson Shareholdings, Inc. + "ril", // ril Reliance Industries Limited "rio", // rio Empresa Municipal de Informática SA - IPLANRIO "rip", // rip United TLD Holdco Ltd. + "rmit", // rmit Royal Melbourne Institute of Technology "rocher", // rocher Ferrero Trading Lux S.A. "rocks", // rocks United TLD Holdco, LTD. "rodeo", // rodeo Top Level Domain Holdings Limited + "rogers", // rogers Rogers Communications Canada Inc. "room", // room Amazon Registry Services, Inc. "rsvp", // rsvp Charleston Road Registry Inc. "ruhr", // ruhr regiodot GmbH & Co. KG @@ -1309,6 +1341,7 @@ public class DomainValidator implements "ups", // ups UPS Market Driver, Inc. "vacations", // vacations Atomic Tigers, LLC "vana", // vana Lifestyle Domain Holdings, Inc. + "vanguard", // vanguard The Vanguard Group, Inc. "vegas", // vegas Dot Vegas, Inc. "ventures", // ventures Binky Lake, LLC "verisign", // verisign VeriSign, Inc. @@ -1331,6 +1364,7 @@ public class DomainValidator implements "vlaanderen", // vlaanderen DNS.be vzw "vodka", // vodka Top Level Domain Holdings Limited "volkswagen", // volkswagen Volkswagen Group of America Inc. + "volvo", // volvo Volvo Holding Sverige Aktiebolag "vote", // vote Monolith Registry LLC "voting", // voting Valuetainment Corp. "voto", // voto Monolith Registry LLC @@ -1367,6 +1401,7 @@ public class DomainValidator implements "work", // work Top Level Domain Holdings Limited "works", // works Little Dynamite, LLC "world", // world Bitter Fields, LLC + "wow", // wow Amazon Registry Services, Inc. "wtc", // wtc World Trade Centers Association, Inc. "wtf", // wtf Hidden Way, LLC "xbox", // xbox Microsoft Corporation @@ -1392,6 +1427,7 @@ public class DomainValidator implements "xn--6frz82g", // ç§»å¨ Afilias Limited "xn--6qq986b3xl", // æç±ä½ Tycoon Treasure Limited "xn--80adxhks", // моÑква Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) + "xn--80aqecdr1a", // каÑолик Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication) "xn--80asehdb", // онлайн CORE Association "xn--80aswg", // ÑÐ°Ð¹Ñ CORE Association "xn--8y0a063a", // èé China United Network Communications Corporation Limited @@ -1421,6 +1457,7 @@ public class DomainValidator implements "xn--fzys8d69uvgm", // é»è¨çç§ PCCW Enterprises Limited "xn--g2xx48c", // è´ç© Minds + Machines Group Limited "xn--gckr3f0f", // ã¯ã©ã¦ã Amazon Registry Services, Inc. + "xn--gk3at1e", // é販 Amazon Registry Services, Inc. "xn--hxt814e", // ç½åº Zodiac Libra Limited "xn--i1b6b1a6a2e", // सà¤à¤à¤ न Public Interest Registry "xn--imr513n", // é¤å HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED @@ -1436,6 +1473,7 @@ public class DomainValidator implements "xn--mgbab2bd", // بازار CORE Association "xn--mgbb9fbpob", // Ù ÙØ¨Ø§ÙÙÙ GreenTech Consultancy Company W.L.L. "xn--mgbca7dzdo", // Ø§Ø¨ÙØ¸Ø¨Ù Abu Dhabi Systems and Information Centre + "xn--mgbi4ecexp", // ÙØ§Ø«ÙÙÙÙ Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication) "xn--mgbt3dhd", // Ù٠را٠Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. "xn--mk1bu44c", // ë·ì»´ VeriSign Sarl "xn--mxtq1m", // æ¿åº Net-Chinese Co., Ltd. @@ -1454,6 +1492,7 @@ public class DomainValidator implements "xn--ses554g", // ç½å KNET Co., Ltd "xn--t60b56a", // ë·ë· VeriSign Sarl "xn--tckwe", // ã³ã VeriSign Sarl + "xn--tiq49xqyj", // 天主æ Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication) "xn--unup4y", // 游æ Spring Fields, LLC "xn--vermgensberater-ctb", // VERMöGENSBERATER Deutsche Vermögensberatung Aktiengesellschaft DVAG "xn--vermgensberatung-pwb", // VERMöGENSBERATUNG Deutsche Vermögensberatung Aktiengesellschaft DVAG @@ -1733,6 +1772,7 @@ public class DomainValidator implements "ws", // Samoa (formerly Western Samoa) "xn--3e0b707e", // íêµ KISA (Korea Internet & Security Agency) "xn--45brj9c", // à¦à¦¾à¦°à¦¤ National Internet Exchange of India + "xn--54b7fta0cc", // বাà¦à¦²à¦¾ Posts and Telecommunications Division "xn--80ao21a", // Òаз Association of IT Companies of Kazakhstan "xn--90a3ac", // ÑÑб Serbian National Internet Domain Registry (RNIDS) "xn--90ais", // ??? Reliable Software Inc.