Author: jleroux
Date: Tue Aug 27 19:32:20 2013
New Revision: 1517947
URL: http://svn.apache.org/r1517947
Log:
This completes r1517629 for one missing "country". Though not independent, and
so (I guess) not in
http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm
the Isle of Man exists as an entity
https://www.iso.org/obp/ui/#iso:code:3166:IM. It can be crossed coming from
other systems, so here it is added (not as part of Great Britain (GBR), like
for instance Guernsey and Jersey)
I wonder about the codes of the other parts of GBR. They don't exist in 3166.
But they were already in GeoData.xml before the Apache era. Anyway they can't
hurt and are not a problem, so far...
This also adds 3166 links to CountryCodeData.xml
Modified:
ofbiz/trunk/framework/common/data/CountryCodeData.xml
ofbiz/trunk/framework/common/data/GeoData.xml
Modified: ofbiz/trunk/framework/common/data/CountryCodeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CountryCodeData.xml?rev=1517947&r1=1517946&r2=1517947&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CountryCodeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CountryCodeData.xml Tue Aug 27 19:32:20
2013
@@ -18,6 +18,14 @@ specific language governing permissions
under the License.
-->
+<!--
+ Based on: ISO 3166 https://www.iso.org/obp/ui/#search
+ and
http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm.
+ See also: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
+ http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+ http://en.wikipedia.org/wiki/ISO_3166-1_numeric
+ -->
+
<entity-engine-xml>
<CountryCode countryAbbr="AFG" countryCode="AF" countryName="AFGHANISTAN"
countryNumber="004"/>
<CountryCode countryAbbr="ALA" countryCode="AX" countryName="Ã
LAND
ISLANDS" countryNumber="248"/>
@@ -130,6 +138,7 @@ under the License.
<CountryCode countryAbbr="IRN" countryCode="IR" countryName="IRAN (ISLAMIC
REPUBLIC OF)" countryNumber="364"/>
<CountryCode countryAbbr="IRQ" countryCode="IQ" countryName="IRAQ"
countryNumber="368"/>
<CountryCode countryAbbr="IRL" countryCode="IE" countryName="IRELAND"
countryNumber="372"/>
+ <CountryCode countryAbbr="IMN" countryCode="IM" countryName="ISLE OF MAN"
countryNumber="833"/>
<CountryCode countryAbbr="ISR" countryCode="IL" countryName="ISRAEL"
countryNumber="376"/>
<CountryCode countryAbbr="ITA" countryCode="IT" countryName="ITALY"
countryNumber="380"/>
<CountryCode countryAbbr="CIV" countryCode="CI" countryName="COTE
D'IVOIRE" countryNumber="384"/>
Modified: ofbiz/trunk/framework/common/data/GeoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData.xml?rev=1517947&r1=1517946&r2=1517947&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData.xml Tue Aug 27 19:32:20 2013
@@ -137,6 +137,7 @@ under the License.
<Geo abbreviation="IRN" geoCode="IR" geoId="IRN" geoName="Iran (islamic
Republic Of)" geoSecCode="364" geoTypeId="COUNTRY"/>
<Geo abbreviation="IRQ" geoCode="IQ" geoId="IRQ" geoName="Iraq"
geoSecCode="368" geoTypeId="COUNTRY"/>
<Geo abbreviation="IRL" geoCode="IE" geoId="IRL" geoName="Ireland"
geoSecCode="372" geoTypeId="COUNTRY"/>
+ <Geo abbreviation="IMN" geoCode="IM" geoId="IMN" geoName="Isle of Man"
geoSecCode="833" geoTypeId="COUNTRY"/>
<Geo abbreviation="ISR" geoCode="IL" geoId="ISR" geoName="Israel"
geoSecCode="376" geoTypeId="COUNTRY"/>
<Geo abbreviation="ITA" geoCode="IT" geoId="ITA" geoName="Italy"
geoSecCode="380" geoTypeId="COUNTRY"/>
<Geo abbreviation="JAM" geoCode="JM" geoId="JAM" geoName="Jamaica"
geoSecCode="388" geoTypeId="COUNTRY"/>
@@ -318,7 +319,7 @@ under the License.
<GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="ENGL"/>
<GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="NIRL"/>
<GeoAssoc geoAssocTypeId="GROUP_MEMBER" geoIdTo="GBR" geoId="WALS"/>
-
+
<CountryAddressFormat geoId="DEU" geoAssocTypeId="REGIONS"
requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
<CountryAddressFormat geoId="GBR" geoAssocTypeId="GROUP_MEMBER"
requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
<CountryAddressFormat geoId="ENGL" geoAssocTypeId="REGIONS"
requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
