Author: sebb
Date: Sun Jan 4 21:03:42 2015
New Revision: 1649419
URL: http://svn.apache.org/r1649419
Log:
VALIDATOR-350 - Should "x.root" validate as a domain name?
Removed "root" from TLD list.
Also "um" and "yu" as they are currently "Not assigned"
Modified:
commons/proper/validator/trunk/RELEASE-NOTES.txt
commons/proper/validator/trunk/src/changes/changes.xml
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
Modified: commons/proper/validator/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/RELEASE-NOTES.txt?rev=1649419&r1=1649418&r2=1649419&view=diff
==============================================================================
--- commons/proper/validator/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/validator/trunk/RELEASE-NOTES.txt Sun Jan 4 21:03:42 2015
@@ -74,6 +74,9 @@ BUGS FROM PREVIOUS RELEASE
* [VALIDATOR-308] - Logical errors in util.Flags affecting check of multiple
flags as well as flag 64
Thanks to Til Boerner
+ * [VALIDATOR-350] - Should "x.root" validate as a domain name?
+ Removed "root" from TLD list.
+ Also "um" and "yu" as they are currently "Not assigned"
IMPROVEMENTS OVER PREVIOUS RELEASE
===================================
@@ -88,7 +91,6 @@ IMPROVEMENTS OVER PREVIOUS RELEASE
Fix up the testCalculateInvalid() invalid method to allow
for
either invalid checksum or syntax (CheckDigitException)
error
when testing the entries in the invalid array.
-
DEPRECATIONS
============
Modified: commons/proper/validator/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/changes/changes.xml?rev=1649419&r1=1649418&r2=1649419&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/changes/changes.xml (original)
+++ commons/proper/validator/trunk/src/changes/changes.xml Sun Jan 4 21:03:42
2015
@@ -43,6 +43,11 @@ The <action> type attribute can be add,u
<body>
<release version="1.4.1" date="tba" description="1.4 Maintenance release">
+ <action issue="VALIDATOR-350" dev="sebb" type="fix">
+ Should "x.root" validate as a domain name?
+ Removed "root" from TLD list.
+ Also "um" and "yu" as they are currently "Not assigned"
+ </action>
<action issue="VALIDATOR-308" dev="sebb" type="fix" due-to="Til Boerner">
Logical errors in util.Flags affecting check of multiple flags as well
as flag 64
</action>
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=1649419&r1=1649418&r2=1649419&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
Sun Jan 4 21:03:42 2015
@@ -232,7 +232,6 @@ public class DomainValidator implements
private static final String[] INFRASTRUCTURE_TLDS = new String[] {
"arpa", // internet infrastructure
- "root" // diagnostic marker for non-truncated root zone
};
private static final String[] GENERIC_TLDS = new String[] {
@@ -1013,8 +1012,6 @@ public class DomainValidator implements
"ua", // Ukraine
"ug", // Uganda
"uk", // United Kingdom
- "um", // United States Minor Outlying Islands
- // TODO um is not in the IANA text file, it is
in the HTML file
"us", // United States of America
"uy", // Uruguay
"uz", // Uzbekistan
@@ -1067,9 +1064,6 @@ public class DomainValidator implements
"xn--ygbi2ammx", // ÙÙسطÙÙ Ministry of Telecom & Information
Technology (MTIT)
"ye", // Yemen
"yt", // Mayotte
- "yu", // Serbia and Montenegro (originally Yugoslavia)
- // TODO yu is not in the IANA text file, nor it
is in the HTML file
- // It looks like it has been removed from use
"za", // South Africa
"zm", // Zambia
"zw", // Zimbabwe
