You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Ashish Vijaywargiya <vi...@gmail.com> on 2013/12/01 07:32:29 UTC

Re: svn commit: r1533533 - in /ofbiz/branches/release11.04: ./ framework/common/data/CountryCodeData.xml framework/common/data/GeoData.xml

Hello Jacques,

Can you please revert the changes related to entity CountryAddressFormat?
Actually I am asking you to do so because CountryAddressFormat entity was
introduced later on from RB11.04 which was created in April 2011. For more
details please refer commit:

Author: sascharodekamp
Date: Wed Aug  3 09:12:31 2011
New Revision: 1153402

I don't think that as such rest of the changes from this commit will create
any issue so you can leave them as is or if you like you can revert those
changes as well.

I am seeing following error message when loading data in ReleaseBranch11.04:

[java] 2013-11-30 04:39:25,970 (main) [
EntitySaxReader.java:270:INFO ] Transaction Timeout set to 2 hours
(7200 seconds)
     [java] 2013-11-30 04:39:26,262 (main) [   GenericDelegator.java:383:ERROR]
     [java] ---- exception report
----------------------------------------------------------
     [java] Error getting entity definition from model
     [java] Exception: org.ofbiz.entity.GenericModelException
     [java] Message: Could not find definition for entity name
CountryAddressFormat
     [java] ---- stack trace
---------------------------------------------------------------
     [java] org.ofbiz.entity.GenericModelException: Could not find
definition for entity name CountryAddressFormat
     [java] org.ofbiz.entity.model.ModelReader.getModelEntity(ModelReader.java:452)
     [java] org.ofbiz.entity.GenericDelegator.getModelEntity(GenericDelegator.java:381)
     [java] org.ofbiz.entity.GenericDelegator.makeValue(GenericDelegator.java:559)
     [java] org.ofbiz.entity.util.EntitySaxReader.startElement(EntitySaxReader.java:545)
     [java] javolution.xml.sax.XMLReaderImpl.parseAll(XMLReaderImpl.java:326)
     [java] javolution.xml.sax.XMLReaderImpl.parse(XMLReaderImpl.java:100)
     [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:273)
     [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:225)
     [java] org.ofbiz.entity.util.EntityDataLoader.loadData(EntityDataLoader.java:214)
     [java] org.ofbiz.entityext.data.EntityDataLoadContainer.start(EntityDataLoadContainer.java:382)
     [java] org.ofbiz.base.container.ContainerLoader.start(ContainerLoader.java:231)
     [java] org.ofbiz.base.start.Start.startStartLoaders(Start.java:247)
     [java] org.ofbiz.base.start.Start.start(Start.java:226)
     [java] org.ofbiz.base.start.Start.main(Start.java:70)
     [java] --------------------------------------------------------------------------------
     [java]
     [java] 2013-11-30 04:39:26,262 (main) [    EntitySaxReader.java:553:ERROR]
     [java] ---- runtime exception report
--------------------------------------------------
     [java] Exception: java.lang.IllegalArgumentException
     [java] Message: [GenericDelegator.makeValue] could not find
entity for entityName: CountryAddressFormat
     [java] ---- stack trace
---------------------------------------------------------------
     [java] java.lang.IllegalArgumentException:
[GenericDelegator.makeValue] could not find entity for entityName:
CountryAddressFormat
     [java] org.ofbiz.entity.GenericDelegator.makeValue(GenericDelegator.java:561)
     [java] org.ofbiz.entity.util.EntitySaxReader.startElement(EntitySaxReader.java:545)
     [java] javolution.xml.sax.XMLReaderImpl.parseAll(XMLReaderImpl.java:326)
     [java] javolution.xml.sax.XMLReaderImpl.parse(XMLReaderImpl.java:100)
     [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:273)
     [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:225)
     [java] org.ofbiz.entity.util.EntityDataLoader.loadData(EntityDataLoader.java:214)
     [java] org.ofbiz.entityext.data.EntityDataLoadContainer.start(EntityDataLoadContainer.java:382)
     [java] org.ofbiz.base.container.ContainerLoader.start(ContainerLoader.java:231)
     [java] org.ofbiz.base.start.Start.startStartLoaders(Start.java:247)
     [java] org.ofbiz.base.start.Start.start(Start.java:226)
     [java] org.ofbiz.base.start.Start.main(Start.java:70)
     [java] --------------------------------------------------------------------------------


--

Kind Regards
Ashish Vijaywargiya



On Fri, Oct 18, 2013 at 9:47 PM, <jl...@apache.org> wrote:

> Author: jleroux
> Date: Fri Oct 18 16:17:41 2013
> New Revision: 1533533
>
> URL: http://svn.apache.org/r1533533
> Log:
> Applied fix from trunk for revisions: 1517947, 1517702, 1517629, 1518950
>
> Modified:
>     ofbiz/branches/release11.04/   (props changed)
>     ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
>     ofbiz/branches/release11.04/framework/common/data/GeoData.xml
>
> Propchange: ofbiz/branches/release11.04/
>
> ------------------------------------------------------------------------------
>   Merged /ofbiz/trunk:r1517629,1517702,1517947,1518950
>
> Modified:
> ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml?rev=1533533&r1=1533532&r2=1533533&view=diff
>
> ==============================================================================
> --- ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
> (original)
> +++ ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
> Fri Oct 18 16:17:41 2013
> @@ -18,8 +18,17 @@ 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"/>
>      <CountryCode countryAbbr="ALB" countryCode="AL" countryName="ALBANIA"
> countryNumber="008"/>
>      <CountryCode countryAbbr="ATA" countryCode="AQ"
> countryName="ANTARCTICA" countryNumber="010"/>
>      <CountryCode countryAbbr="DZA" countryCode="DZ" countryName="ALGERIA"
> countryNumber="012"/>
> @@ -40,6 +49,7 @@ under the License.
>      <CountryCode countryAbbr="BMU" countryCode="BM" countryName="BERMUDA"
> countryNumber="060"/>
>      <CountryCode countryAbbr="BTN" countryCode="BT" countryName="BHUTAN"
> countryNumber="064"/>
>      <CountryCode countryAbbr="BOL" countryCode="BO" countryName="BOLIVIA"
> countryNumber="068"/>
> +    <CountryCode countryAbbr="BES" countryCode="BQ" countryName="BONAIRE,
> SINT EUSTATIUS AND SABA" countryNumber="535"/>
>      <CountryCode countryAbbr="BIH" countryCode="BA" countryName="BOSNIA
> AND HERZEGOWINA" countryNumber="070"/>
>      <CountryCode countryAbbr="BWA" countryCode="BW"
> countryName="BOTSWANA" countryNumber="072"/>
>      <CountryCode countryAbbr="BVT" countryCode="BV" countryName="BOUVET
> ISLAND" countryNumber="074"/>
> @@ -75,6 +85,7 @@ under the License.
>      <CountryCode countryAbbr="CRI" countryCode="CR" countryName="COSTA
> RICA" countryNumber="188"/>
>      <CountryCode countryAbbr="HRV" countryCode="HR" countryName="CROATIA
> (local name: Hrvatska)" countryNumber="191"/>
>      <CountryCode countryAbbr="CUB" countryCode="CU" countryName="CUBA"
> countryNumber="192"/>
> +    <CountryCode countryAbbr="CUW" countryCode="CW"
> countryName="CURAÇAO" countryNumber="531"/>
>      <CountryCode countryAbbr="CYP" countryCode="CY" countryName="CYPRUS"
> countryNumber="196"/>
>      <CountryCode countryAbbr="CZE" countryCode="CZ" countryName="CZECH
> REPUBLIC" countryNumber="203"/>
>      <CountryCode countryAbbr="BEN" countryCode="BJ" countryName="BENIN"
> countryNumber="204"/>
> @@ -101,6 +112,7 @@ under the License.
>      <CountryCode countryAbbr="GAB" countryCode="GA" countryName="GABON"
> countryNumber="266"/>
>      <CountryCode countryAbbr="GEO" countryCode="GE" countryName="GEORGIA"
> countryNumber="268"/>
>      <CountryCode countryAbbr="GMB" countryCode="GM" countryName="GAMBIA"
> countryNumber="270"/>
> +    <CountryCode countryAbbr="GGY" countryCode="GG"
> countryName="GUERNSEY" countryNumber="831"/>
>      <CountryCode countryAbbr="PSE" countryCode="PS"
> countryName="PALESTINIAN TERRITORY, OCCUPIED" countryNumber="275"/>
>      <CountryCode countryAbbr="DEU" countryCode="DE" countryName="GERMANY"
> countryNumber="276"/>
>      <CountryCode countryAbbr="GHA" countryCode="GH" countryName="GHANA"
> countryNumber="288"/>
> @@ -126,11 +138,13 @@ 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&apos;IVOIRE" countryNumber="384"/>
>      <CountryCode countryAbbr="JAM" countryCode="JM" countryName="JAMAICA"
> countryNumber="388"/>
>      <CountryCode countryAbbr="JPN" countryCode="JP" countryName="JAPAN"
> countryNumber="392"/>
> +    <CountryCode countryAbbr="JEY" countryCode="JE" countryName="JERSEY"
> countryNumber="832"/>
>      <CountryCode countryAbbr="KAZ" countryCode="KZ"
> countryName="KAZAKHSTAN" countryNumber="398"/>
>      <CountryCode countryAbbr="JOR" countryCode="JO" countryName="JORDAN"
> countryNumber="400"/>
>      <CountryCode countryAbbr="KEN" countryCode="KE" countryName="KENYA"
> countryNumber="404"/>
> @@ -160,6 +174,7 @@ under the License.
>      <CountryCode countryAbbr="MEX" countryCode="MX" countryName="MEXICO"
> countryNumber="484"/>
>      <CountryCode countryAbbr="MCO" countryCode="MC" countryName="MONACO"
> countryNumber="492"/>
>      <CountryCode countryAbbr="MNG" countryCode="MN"
> countryName="MONGOLIA" countryNumber="496"/>
> +    <CountryCode countryAbbr="MNE" countryCode="ME"
> countryName="MONTENEGRO" countryNumber="499"/>
>      <CountryCode countryAbbr="MDA" countryCode="MD" countryName="MOLDOVA,
> REPUBLIC OF" countryNumber="498"/>
>      <CountryCode countryAbbr="MSR" countryCode="MS"
> countryName="MONTSERRAT" countryNumber="500"/>
>      <CountryCode countryAbbr="MAR" countryCode="MA" countryName="MOROCCO"
> countryNumber="504"/>
> @@ -206,6 +221,8 @@ under the License.
>      <CountryCode countryAbbr="KNA" countryCode="KN" countryName="SAINT
> KITTS AND NEVIS" countryNumber="659"/>
>      <CountryCode countryAbbr="AIA" countryCode="AI"
> countryName="ANGUILLA" countryNumber="660"/>
>      <CountryCode countryAbbr="LCA" countryCode="LC" countryName="SAINT
> LUCIA" countryNumber="662"/>
> +    <CountryCode countryAbbr="BLM" countryCode="BL" countryName="SAINT
> BARTHÉLEMY" countryNumber="652"/>
> +    <CountryCode countryAbbr="MAF" countryCode="MF" countryName="SAINT
> MARTIN (FRENCH PART)" countryNumber="663"/>
>      <CountryCode countryAbbr="SPM" countryCode="PM" countryName="ST.
> PIERRE AND MIQUELON" countryNumber="666"/>
>      <CountryCode countryAbbr="VCT" countryCode="VC" countryName="SAINT
> VINCENT AND THE GRENADINES" countryNumber="670"/>
>      <CountryCode countryAbbr="SMR" countryCode="SM" countryName="SAN
> MARINO" countryNumber="674"/>
> @@ -215,11 +232,13 @@ under the License.
>      <CountryCode countryAbbr="SYC" countryCode="SC"
> countryName="SEYCHELLES" countryNumber="690"/>
>      <CountryCode countryAbbr="SLE" countryCode="SL" countryName="SIERRA
> LEONE" countryNumber="694"/>
>      <CountryCode countryAbbr="SGP" countryCode="SG"
> countryName="SINGAPORE" countryNumber="702"/>
> +    <CountryCode countryAbbr="SXM" countryCode="SX" countryName="SINT
> MAARTEN (DUTCH PART)" countryNumber="534"/>
>      <CountryCode countryAbbr="SVK" countryCode="SK" countryName="SLOVAKIA
> (Slovak Republic)" countryNumber="703"/>
>      <CountryCode countryAbbr="VNM" countryCode="VN" countryName="VIET
> NAM" countryNumber="704"/>
>      <CountryCode countryAbbr="SVN" countryCode="SI"
> countryName="SLOVENIA" countryNumber="705"/>
>      <CountryCode countryAbbr="SOM" countryCode="SO" countryName="SOMALIA"
> countryNumber="706"/>
>      <CountryCode countryAbbr="ZAF" countryCode="ZA" countryName="SOUTH
> AFRICA" countryNumber="710"/>
> +    <CountryCode countryAbbr="SSD" countryCode="SS" countryName="SOUTH
> SUDAN" countryNumber="728"/>
>      <CountryCode countryAbbr="ZWE" countryCode="ZW"
> countryName="ZIMBABWE" countryNumber="716"/>
>      <CountryCode countryAbbr="ESP" countryCode="ES" countryName="SPAIN"
> countryNumber="724"/>
>      <CountryCode countryAbbr="ESH" countryCode="EH" countryName="WESTERN
> SAHARA" countryNumber="732"/>
>
> Modified: ofbiz/branches/release11.04/framework/common/data/GeoData.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/data/GeoData.xml?rev=1533533&r1=1533532&r2=1533533&view=diff
>
> ==============================================================================
> --- ofbiz/branches/release11.04/framework/common/data/GeoData.xml
> (original)
> +++ ofbiz/branches/release11.04/framework/common/data/GeoData.xml Fri Oct
> 18 16:17:41 2013
> @@ -20,13 +20,15 @@ under the License.
>
>  <entity-engine-xml>
>      <!--
> -        Based on: ISO 3166
> http://www.iso.org/iso/en/prods-services/iso3166ma/index.html
> +        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
>      -->
>      <Geo abbreviation="_NA_" geoCode="_NA_" geoId="_NA_" geoName="Not
> Applicable"/>
>      <Geo abbreviation="AFG" geoCode="AF" geoId="AFG"
> geoName="Afghanistan" geoSecCode="004" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="ALA" geoCode="AX" geoId="ALA" geoName="Ã…land
> islands" geoSecCode="248" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="ALB" geoCode="AL" geoId="ALB" geoName="Albania"
> geoSecCode="008" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="DZA" geoCode="DZ" geoId="DZA" geoName="Algeria"
> geoSecCode="012" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="ASM" geoCode="AS" geoId="ASM" geoName="American
> Samoa" geoSecCode="016" geoTypeId="COUNTRY"/>
> @@ -47,6 +49,7 @@ under the License.
>      <Geo abbreviation="BRB" geoCode="BB" geoId="BRB" geoName="Barbados"
> geoSecCode="052" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="BLR" geoCode="BY" geoId="BLR" geoName="Belarus"
> geoSecCode="112" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="BEL" geoCode="BE" geoId="BEL" geoName="Belgium"
> geoSecCode="056" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="BES" geoCode="BQ" geoId="BES" geoName="Bonaire,
> Sint Eustatius and Saba" geoSecCode="535" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="BLZ" geoCode="BZ" geoId="BLZ" geoName="Belize"
> geoSecCode="084" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="BEN" geoCode="BJ" geoId="BEN" geoName="Benin"
> geoSecCode="204" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="BMU" geoCode="BM" geoId="BMU" geoName="Bermuda"
> geoSecCode="060" geoTypeId="COUNTRY"/>
> @@ -81,6 +84,7 @@ under the License.
>      <Geo abbreviation="CIV" geoCode="CI" geoId="CIV" geoName="Cote
> D&apos;ivoire" geoSecCode="384" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="HRV" geoCode="HR" geoId="HRV" geoName="Croatia
> (local Name: Hrvatska)" geoSecCode="191" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="CUB" geoCode="CU" geoId="CUB" geoName="Cuba"
> geoSecCode="192" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="CUW" geoCode="CW" geoId="CUW" geoName="Curaçao"
> geoSecCode="531" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="CYP" geoCode="CY" geoId="CYP" geoName="Cyprus"
> geoSecCode="196" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="CZE" geoCode="CZ" geoId="CZE" geoName="Czech
> Republic" geoSecCode="203" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="DNK" geoCode="DK" geoId="DNK" geoName="Denmark"
> geoSecCode="208" geoTypeId="COUNTRY"/>
> @@ -132,6 +136,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"/>
> @@ -212,6 +217,8 @@ under the License.
>      <Geo abbreviation="KNA" geoCode="KN" geoId="KNA" geoName="Saint Kitts
> And Nevis" geoSecCode="659" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="LCA" geoCode="LC" geoId="LCA" geoName="Saint
> Lucia" geoSecCode="662" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="VCT" geoCode="VC" geoId="VCT" geoName="Saint
> Vincent And The Grenadines" geoSecCode="670" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="BLM" geoCode="BL" geoId="BLM" geoName="Saint
> Barthélemy" geoSecCode="652" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="MAF" geoCode="MF" geoId="MAF" geoName="Saint
> Martin (French part)" geoSecCode="663" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="WSM" geoCode="WS" geoId="WSM" geoName="Samoa"
> geoSecCode="882" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SMR" geoCode="SM" geoId="SMR" geoName="San Marino"
> geoSecCode="674" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="STP" geoCode="ST" geoId="STP" geoName="Sao Tome
> And Principe" geoSecCode="678" geoTypeId="COUNTRY"/>
> @@ -223,11 +230,13 @@ under the License.
>      <Geo abbreviation="SLE" geoCode="SL" geoId="SLE" geoName="Sierra
> Leone" geoSecCode="694" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SGP" geoCode="SG" geoId="SGP" geoName="Singapore"
> geoSecCode="702" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SVK" geoCode="SK" geoId="SVK" geoName="Slovakia
> (slovak Republic)" geoSecCode="703" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="SXM" geoCode="SX" geoId="SXM" geoName="Sint
> Maarten (Dutch part)" geoSecCode="534" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SVN" geoCode="SI" geoId="SVN" geoName="Slovenia"
> geoSecCode="705" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SLB" geoCode="SB" geoId="SLB" geoName="Solomon
> Islands" geoSecCode="090" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SOM" geoCode="SO" geoId="SOM" geoName="Somalia"
> geoSecCode="706" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SGS" geoCode="GS" geoId="SGS" geoName="South
> Georgia And The South Sandwich Islands" geoSecCode="239"
> geoTypeId="COUNTRY"/>
>      <Geo abbreviation="ZAF" geoCode="ZA" geoId="ZAF" geoName="South
> Africa" geoSecCode="710" geoTypeId="COUNTRY"/>
> +    <Geo abbreviation="SSD" geoCode="SS" geoId="SSD" geoName="South
> Sudan" geoSecCode="728" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="ESP" geoCode="ES" geoId="ESP" geoName="Spain"
> geoSecCode="724" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="LKA" geoCode="LK" geoId="LKA" geoName="Sri Lanka"
> geoSecCode="144" geoTypeId="COUNTRY"/>
>      <Geo abbreviation="SHN" geoCode="SH" geoId="SHN" geoName="St. Helena"
> geoSecCode="654" geoTypeId="COUNTRY"/>
> @@ -308,4 +317,25 @@ 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=""/>
> +    <CountryAddressFormat geoId="NIRL" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="WALS" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="SCOT" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="USA" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="CAN" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="AUS" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="BGR" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="BRA" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="CHN" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="COL" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="MEX" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="NLD" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="POL" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="IND" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="ITA" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="CHE" geoAssocTypeId="REGIONS"
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
> +    <CountryAddressFormat geoId="FRA" geoAssocTypeId=""
> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>  </entity-engine-xml>
>
>
>

Re: svn commit: r1533533 - in /ofbiz/branches/release11.04: ./ framework/common/data/CountryCodeData.xml framework/common/data/GeoData.xml

Posted by Ashish Vijaywargiya <as...@hotwaxmedia.com>.
Thanks so much Jacques!

--
Kind Regards
Ashish Vijaywargiya
HotWax Media - est. 1997
ApacheCon US 2013 Gold Sponsor
http://na.apachecon.com/sponsors/

On Monday 02 December 2013 02:13 AM, Jacques Le Roux wrote:
> Thanks Ashish,
>
> Done at r1546856
>
> Jacques
>
> On Sunday, December 01, 2013 7:32 AM Ashish Vijaywargiya <vi...@gmail.com> wrote:
>> Hello Jacques,
>>
>> Can you please revert the changes related to entity CountryAddressFormat?
>> Actually I am asking you to do so because CountryAddressFormat entity was
>> introduced later on from RB11.04 which was created in April 2011. For more
>> details please refer commit:
>>
>> Author: sascharodekamp
>> Date: Wed Aug  3 09:12:31 2011
>> New Revision: 1153402
>>
>> I don't think that as such rest of the changes from this commit will create
>> any issue so you can leave them as is or if you like you can revert those
>> changes as well.
>>
>> I am seeing following error message when loading data in ReleaseBranch11.04:
>>
>> [java] 2013-11-30 04:39:25,970 (main) [
>> EntitySaxReader.java:270:INFO ] Transaction Timeout set to 2 hours
>> (7200 seconds)
>>       [java] 2013-11-30 04:39:26,262 (main) [   GenericDelegator.java:383:ERROR]
>>       [java] ---- exception report
>> ----------------------------------------------------------
>>       [java] Error getting entity definition from model
>>       [java] Exception: org.ofbiz.entity.GenericModelException
>>       [java] Message: Could not find definition for entity name
>> CountryAddressFormat
>>       [java] ---- stack trace
>> ---------------------------------------------------------------
>>       [java] org.ofbiz.entity.GenericModelException: Could not find
>> definition for entity name CountryAddressFormat
>>       [java] org.ofbiz.entity.model.ModelReader.getModelEntity(ModelReader.java:452)
>>



Re: svn commit: r1533533 - in /ofbiz/branches/release11.04: ./ framework/common/data/CountryCodeData.xml framework/common/data/GeoData.xml

Posted by Jacques Le Roux <ja...@les7arts.com>.
Thanks Ashish,

Done at r1546856

Jacques

On Sunday, December 01, 2013 7:32 AM Ashish Vijaywargiya <vi...@gmail.com> wrote:
> Hello Jacques,
> 
> Can you please revert the changes related to entity CountryAddressFormat?
> Actually I am asking you to do so because CountryAddressFormat entity was
> introduced later on from RB11.04 which was created in April 2011. For more
> details please refer commit:
> 
> Author: sascharodekamp
> Date: Wed Aug  3 09:12:31 2011
> New Revision: 1153402
> 
> I don't think that as such rest of the changes from this commit will create
> any issue so you can leave them as is or if you like you can revert those
> changes as well.
> 
> I am seeing following error message when loading data in ReleaseBranch11.04:
> 
> [java] 2013-11-30 04:39:25,970 (main) [
> EntitySaxReader.java:270:INFO ] Transaction Timeout set to 2 hours
> (7200 seconds)
>      [java] 2013-11-30 04:39:26,262 (main) [   GenericDelegator.java:383:ERROR]
>      [java] ---- exception report
> ----------------------------------------------------------
>      [java] Error getting entity definition from model
>      [java] Exception: org.ofbiz.entity.GenericModelException
>      [java] Message: Could not find definition for entity name
> CountryAddressFormat
>      [java] ---- stack trace
> ---------------------------------------------------------------
>      [java] org.ofbiz.entity.GenericModelException: Could not find
> definition for entity name CountryAddressFormat
>      [java] org.ofbiz.entity.model.ModelReader.getModelEntity(ModelReader.java:452)
>      [java] org.ofbiz.entity.GenericDelegator.getModelEntity(GenericDelegator.java:381)
>      [java] org.ofbiz.entity.GenericDelegator.makeValue(GenericDelegator.java:559)
>      [java] org.ofbiz.entity.util.EntitySaxReader.startElement(EntitySaxReader.java:545)
>      [java] javolution.xml.sax.XMLReaderImpl.parseAll(XMLReaderImpl.java:326)
>      [java] javolution.xml.sax.XMLReaderImpl.parse(XMLReaderImpl.java:100)
>      [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:273)
>      [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:225)
>      [java] org.ofbiz.entity.util.EntityDataLoader.loadData(EntityDataLoader.java:214)
>      [java] org.ofbiz.entityext.data.EntityDataLoadContainer.start(EntityDataLoadContainer.java:382)
>      [java] org.ofbiz.base.container.ContainerLoader.start(ContainerLoader.java:231)
>      [java] org.ofbiz.base.start.Start.startStartLoaders(Start.java:247)
>      [java] org.ofbiz.base.start.Start.start(Start.java:226)
>      [java] org.ofbiz.base.start.Start.main(Start.java:70)
>      [java] --------------------------------------------------------------------------------
>      [java]
>      [java] 2013-11-30 04:39:26,262 (main) [    EntitySaxReader.java:553:ERROR]
>      [java] ---- runtime exception report
> --------------------------------------------------
>      [java] Exception: java.lang.IllegalArgumentException
>      [java] Message: [GenericDelegator.makeValue] could not find
> entity for entityName: CountryAddressFormat
>      [java] ---- stack trace
> ---------------------------------------------------------------
>      [java] java.lang.IllegalArgumentException:
> [GenericDelegator.makeValue] could not find entity for entityName:
> CountryAddressFormat
>      [java] org.ofbiz.entity.GenericDelegator.makeValue(GenericDelegator.java:561)
>      [java] org.ofbiz.entity.util.EntitySaxReader.startElement(EntitySaxReader.java:545)
>      [java] javolution.xml.sax.XMLReaderImpl.parseAll(XMLReaderImpl.java:326)
>      [java] javolution.xml.sax.XMLReaderImpl.parse(XMLReaderImpl.java:100)
>      [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:273)
>      [java] org.ofbiz.entity.util.EntitySaxReader.parse(EntitySaxReader.java:225)
>      [java] org.ofbiz.entity.util.EntityDataLoader.loadData(EntityDataLoader.java:214)
>      [java] org.ofbiz.entityext.data.EntityDataLoadContainer.start(EntityDataLoadContainer.java:382)
>      [java] org.ofbiz.base.container.ContainerLoader.start(ContainerLoader.java:231)
>      [java] org.ofbiz.base.start.Start.startStartLoaders(Start.java:247)
>      [java] org.ofbiz.base.start.Start.start(Start.java:226)
>      [java] org.ofbiz.base.start.Start.main(Start.java:70)
>      [java] --------------------------------------------------------------------------------
> 
> 
> 
>> Author: jleroux
>> Date: Fri Oct 18 16:17:41 2013
>> New Revision: 1533533
>> 
>> URL: http://svn.apache.org/r1533533
>> Log:
>> Applied fix from trunk for revisions: 1517947, 1517702, 1517629, 1518950
>> 
>> Modified:
>>     ofbiz/branches/release11.04/   (props changed)
>>     ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
>>     ofbiz/branches/release11.04/framework/common/data/GeoData.xml
>> 
>> Propchange: ofbiz/branches/release11.04/
>> 
>> ------------------------------------------------------------------------------
>>   Merged /ofbiz/trunk:r1517629,1517702,1517947,1518950
>> 
>> Modified:
>> ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml?rev=1533533&r1=1533532&r2=1533533&view=diff
>> 
>> ==============================================================================
>> --- ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
>> (original)
>> +++ ofbiz/branches/release11.04/framework/common/data/CountryCodeData.xml
>> Fri Oct 18 16:17:41 2013
>> @@ -18,8 +18,17 @@ 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"/>
>>      <CountryCode countryAbbr="ALB" countryCode="AL" countryName="ALBANIA"
>> countryNumber="008"/>
>>      <CountryCode countryAbbr="ATA" countryCode="AQ"
>> countryName="ANTARCTICA" countryNumber="010"/>
>>      <CountryCode countryAbbr="DZA" countryCode="DZ" countryName="ALGERIA"
>> countryNumber="012"/>
>> @@ -40,6 +49,7 @@ under the License.
>>      <CountryCode countryAbbr="BMU" countryCode="BM" countryName="BERMUDA"
>> countryNumber="060"/>
>>      <CountryCode countryAbbr="BTN" countryCode="BT" countryName="BHUTAN"
>> countryNumber="064"/>
>>      <CountryCode countryAbbr="BOL" countryCode="BO" countryName="BOLIVIA"
>> countryNumber="068"/>
>> +    <CountryCode countryAbbr="BES" countryCode="BQ" countryName="BONAIRE,
>> SINT EUSTATIUS AND SABA" countryNumber="535"/>
>>      <CountryCode countryAbbr="BIH" countryCode="BA" countryName="BOSNIA
>> AND HERZEGOWINA" countryNumber="070"/>
>>      <CountryCode countryAbbr="BWA" countryCode="BW"
>> countryName="BOTSWANA" countryNumber="072"/>
>>      <CountryCode countryAbbr="BVT" countryCode="BV" countryName="BOUVET
>> ISLAND" countryNumber="074"/>
>> @@ -75,6 +85,7 @@ under the License.
>>      <CountryCode countryAbbr="CRI" countryCode="CR" countryName="COSTA
>> RICA" countryNumber="188"/>
>>      <CountryCode countryAbbr="HRV" countryCode="HR" countryName="CROATIA
>> (local name: Hrvatska)" countryNumber="191"/>
>>      <CountryCode countryAbbr="CUB" countryCode="CU" countryName="CUBA"
>> countryNumber="192"/>
>> +    <CountryCode countryAbbr="CUW" countryCode="CW"
>> countryName="CURAÇAO" countryNumber="531"/>
>>      <CountryCode countryAbbr="CYP" countryCode="CY" countryName="CYPRUS"
>> countryNumber="196"/>
>>      <CountryCode countryAbbr="CZE" countryCode="CZ" countryName="CZECH
>> REPUBLIC" countryNumber="203"/>
>>      <CountryCode countryAbbr="BEN" countryCode="BJ" countryName="BENIN"
>> countryNumber="204"/>
>> @@ -101,6 +112,7 @@ under the License.
>>      <CountryCode countryAbbr="GAB" countryCode="GA" countryName="GABON"
>> countryNumber="266"/>
>>      <CountryCode countryAbbr="GEO" countryCode="GE" countryName="GEORGIA"
>> countryNumber="268"/>
>>      <CountryCode countryAbbr="GMB" countryCode="GM" countryName="GAMBIA"
>> countryNumber="270"/>
>> +    <CountryCode countryAbbr="GGY" countryCode="GG"
>> countryName="GUERNSEY" countryNumber="831"/>
>>      <CountryCode countryAbbr="PSE" countryCode="PS"
>> countryName="PALESTINIAN TERRITORY, OCCUPIED" countryNumber="275"/>
>>      <CountryCode countryAbbr="DEU" countryCode="DE" countryName="GERMANY"
>> countryNumber="276"/>
>>      <CountryCode countryAbbr="GHA" countryCode="GH" countryName="GHANA"
>> countryNumber="288"/>
>> @@ -126,11 +138,13 @@ 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&apos;IVOIRE" countryNumber="384"/>
>>      <CountryCode countryAbbr="JAM" countryCode="JM" countryName="JAMAICA"
>> countryNumber="388"/>
>>      <CountryCode countryAbbr="JPN" countryCode="JP" countryName="JAPAN"
>> countryNumber="392"/>
>> +    <CountryCode countryAbbr="JEY" countryCode="JE" countryName="JERSEY"
>> countryNumber="832"/>
>>      <CountryCode countryAbbr="KAZ" countryCode="KZ"
>> countryName="KAZAKHSTAN" countryNumber="398"/>
>>      <CountryCode countryAbbr="JOR" countryCode="JO" countryName="JORDAN"
>> countryNumber="400"/>
>>      <CountryCode countryAbbr="KEN" countryCode="KE" countryName="KENYA"
>> countryNumber="404"/>
>> @@ -160,6 +174,7 @@ under the License.
>>      <CountryCode countryAbbr="MEX" countryCode="MX" countryName="MEXICO"
>> countryNumber="484"/>
>>      <CountryCode countryAbbr="MCO" countryCode="MC" countryName="MONACO"
>> countryNumber="492"/>
>>      <CountryCode countryAbbr="MNG" countryCode="MN"
>> countryName="MONGOLIA" countryNumber="496"/>
>> +    <CountryCode countryAbbr="MNE" countryCode="ME"
>> countryName="MONTENEGRO" countryNumber="499"/>
>>      <CountryCode countryAbbr="MDA" countryCode="MD" countryName="MOLDOVA,
>> REPUBLIC OF" countryNumber="498"/>
>>      <CountryCode countryAbbr="MSR" countryCode="MS"
>> countryName="MONTSERRAT" countryNumber="500"/>
>>      <CountryCode countryAbbr="MAR" countryCode="MA" countryName="MOROCCO"
>> countryNumber="504"/>
>> @@ -206,6 +221,8 @@ under the License.
>>      <CountryCode countryAbbr="KNA" countryCode="KN" countryName="SAINT
>> KITTS AND NEVIS" countryNumber="659"/>
>>      <CountryCode countryAbbr="AIA" countryCode="AI"
>> countryName="ANGUILLA" countryNumber="660"/>
>>      <CountryCode countryAbbr="LCA" countryCode="LC" countryName="SAINT
>> LUCIA" countryNumber="662"/>
>> +    <CountryCode countryAbbr="BLM" countryCode="BL" countryName="SAINT
>> BARTHÉLEMY" countryNumber="652"/>
>> +    <CountryCode countryAbbr="MAF" countryCode="MF" countryName="SAINT
>> MARTIN (FRENCH PART)" countryNumber="663"/>
>>      <CountryCode countryAbbr="SPM" countryCode="PM" countryName="ST.
>> PIERRE AND MIQUELON" countryNumber="666"/>
>>      <CountryCode countryAbbr="VCT" countryCode="VC" countryName="SAINT
>> VINCENT AND THE GRENADINES" countryNumber="670"/>
>>      <CountryCode countryAbbr="SMR" countryCode="SM" countryName="SAN
>> MARINO" countryNumber="674"/>
>> @@ -215,11 +232,13 @@ under the License.
>>      <CountryCode countryAbbr="SYC" countryCode="SC"
>> countryName="SEYCHELLES" countryNumber="690"/>
>>      <CountryCode countryAbbr="SLE" countryCode="SL" countryName="SIERRA
>> LEONE" countryNumber="694"/>
>>      <CountryCode countryAbbr="SGP" countryCode="SG"
>> countryName="SINGAPORE" countryNumber="702"/>
>> +    <CountryCode countryAbbr="SXM" countryCode="SX" countryName="SINT
>> MAARTEN (DUTCH PART)" countryNumber="534"/>
>>      <CountryCode countryAbbr="SVK" countryCode="SK" countryName="SLOVAKIA
>> (Slovak Republic)" countryNumber="703"/>
>>      <CountryCode countryAbbr="VNM" countryCode="VN" countryName="VIET
>> NAM" countryNumber="704"/>
>>      <CountryCode countryAbbr="SVN" countryCode="SI"
>> countryName="SLOVENIA" countryNumber="705"/>
>>      <CountryCode countryAbbr="SOM" countryCode="SO" countryName="SOMALIA"
>> countryNumber="706"/>
>>      <CountryCode countryAbbr="ZAF" countryCode="ZA" countryName="SOUTH
>> AFRICA" countryNumber="710"/>
>> +    <CountryCode countryAbbr="SSD" countryCode="SS" countryName="SOUTH
>> SUDAN" countryNumber="728"/>
>>      <CountryCode countryAbbr="ZWE" countryCode="ZW"
>> countryName="ZIMBABWE" countryNumber="716"/>
>>      <CountryCode countryAbbr="ESP" countryCode="ES" countryName="SPAIN"
>> countryNumber="724"/>
>>      <CountryCode countryAbbr="ESH" countryCode="EH" countryName="WESTERN
>> SAHARA" countryNumber="732"/>
>> 
>> Modified: ofbiz/branches/release11.04/framework/common/data/GeoData.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/data/GeoData.xml?rev=1533533&r1=1533532&r2=1533533&view=diff
>> 
>> ==============================================================================
>> --- ofbiz/branches/release11.04/framework/common/data/GeoData.xml
>> (original)
>> +++ ofbiz/branches/release11.04/framework/common/data/GeoData.xml Fri Oct
>> 18 16:17:41 2013
>> @@ -20,13 +20,15 @@ under the License.
>> 
>>  <entity-engine-xml>
>>      <!--
>> -        Based on: ISO 3166
>> http://www.iso.org/iso/en/prods-services/iso3166ma/index.html
>> +        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
>>      -->
>>      <Geo abbreviation="_NA_" geoCode="_NA_" geoId="_NA_" geoName="Not
>> Applicable"/>
>>      <Geo abbreviation="AFG" geoCode="AF" geoId="AFG"
>> geoName="Afghanistan" geoSecCode="004" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="ALA" geoCode="AX" geoId="ALA" geoName="Ã…land
>> islands" geoSecCode="248" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="ALB" geoCode="AL" geoId="ALB" geoName="Albania"
>> geoSecCode="008" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="DZA" geoCode="DZ" geoId="DZA" geoName="Algeria"
>> geoSecCode="012" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="ASM" geoCode="AS" geoId="ASM" geoName="American
>> Samoa" geoSecCode="016" geoTypeId="COUNTRY"/>
>> @@ -47,6 +49,7 @@ under the License.
>>      <Geo abbreviation="BRB" geoCode="BB" geoId="BRB" geoName="Barbados"
>> geoSecCode="052" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="BLR" geoCode="BY" geoId="BLR" geoName="Belarus"
>> geoSecCode="112" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="BEL" geoCode="BE" geoId="BEL" geoName="Belgium"
>> geoSecCode="056" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="BES" geoCode="BQ" geoId="BES" geoName="Bonaire,
>> Sint Eustatius and Saba" geoSecCode="535" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="BLZ" geoCode="BZ" geoId="BLZ" geoName="Belize"
>> geoSecCode="084" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="BEN" geoCode="BJ" geoId="BEN" geoName="Benin"
>> geoSecCode="204" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="BMU" geoCode="BM" geoId="BMU" geoName="Bermuda"
>> geoSecCode="060" geoTypeId="COUNTRY"/>
>> @@ -81,6 +84,7 @@ under the License.
>>      <Geo abbreviation="CIV" geoCode="CI" geoId="CIV" geoName="Cote
>> D&apos;ivoire" geoSecCode="384" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="HRV" geoCode="HR" geoId="HRV" geoName="Croatia
>> (local Name: Hrvatska)" geoSecCode="191" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="CUB" geoCode="CU" geoId="CUB" geoName="Cuba"
>> geoSecCode="192" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="CUW" geoCode="CW" geoId="CUW" geoName="Curaçao"
>> geoSecCode="531" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="CYP" geoCode="CY" geoId="CYP" geoName="Cyprus"
>> geoSecCode="196" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="CZE" geoCode="CZ" geoId="CZE" geoName="Czech
>> Republic" geoSecCode="203" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="DNK" geoCode="DK" geoId="DNK" geoName="Denmark"
>> geoSecCode="208" geoTypeId="COUNTRY"/>
>> @@ -132,6 +136,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"/>
>> @@ -212,6 +217,8 @@ under the License.
>>      <Geo abbreviation="KNA" geoCode="KN" geoId="KNA" geoName="Saint Kitts
>> And Nevis" geoSecCode="659" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="LCA" geoCode="LC" geoId="LCA" geoName="Saint
>> Lucia" geoSecCode="662" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="VCT" geoCode="VC" geoId="VCT" geoName="Saint
>> Vincent And The Grenadines" geoSecCode="670" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="BLM" geoCode="BL" geoId="BLM" geoName="Saint
>> Barthélemy" geoSecCode="652" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="MAF" geoCode="MF" geoId="MAF" geoName="Saint
>> Martin (French part)" geoSecCode="663" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="WSM" geoCode="WS" geoId="WSM" geoName="Samoa"
>> geoSecCode="882" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SMR" geoCode="SM" geoId="SMR" geoName="San Marino"
>> geoSecCode="674" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="STP" geoCode="ST" geoId="STP" geoName="Sao Tome
>> And Principe" geoSecCode="678" geoTypeId="COUNTRY"/>
>> @@ -223,11 +230,13 @@ under the License.
>>      <Geo abbreviation="SLE" geoCode="SL" geoId="SLE" geoName="Sierra
>> Leone" geoSecCode="694" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SGP" geoCode="SG" geoId="SGP" geoName="Singapore"
>> geoSecCode="702" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SVK" geoCode="SK" geoId="SVK" geoName="Slovakia
>> (slovak Republic)" geoSecCode="703" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="SXM" geoCode="SX" geoId="SXM" geoName="Sint
>> Maarten (Dutch part)" geoSecCode="534" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SVN" geoCode="SI" geoId="SVN" geoName="Slovenia"
>> geoSecCode="705" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SLB" geoCode="SB" geoId="SLB" geoName="Solomon
>> Islands" geoSecCode="090" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SOM" geoCode="SO" geoId="SOM" geoName="Somalia"
>> geoSecCode="706" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SGS" geoCode="GS" geoId="SGS" geoName="South
>> Georgia And The South Sandwich Islands" geoSecCode="239"
>> geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="ZAF" geoCode="ZA" geoId="ZAF" geoName="South
>> Africa" geoSecCode="710" geoTypeId="COUNTRY"/>
>> +    <Geo abbreviation="SSD" geoCode="SS" geoId="SSD" geoName="South
>> Sudan" geoSecCode="728" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="ESP" geoCode="ES" geoId="ESP" geoName="Spain"
>> geoSecCode="724" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="LKA" geoCode="LK" geoId="LKA" geoName="Sri Lanka"
>> geoSecCode="144" geoTypeId="COUNTRY"/>
>>      <Geo abbreviation="SHN" geoCode="SH" geoId="SHN" geoName="St. Helena"
>> geoSecCode="654" geoTypeId="COUNTRY"/>
>> @@ -308,4 +317,25 @@ 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=""/>
>> +    <CountryAddressFormat geoId="NIRL" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="WALS" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="SCOT" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="USA" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="CAN" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="AUS" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="BGR" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="BRA" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="CHN" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="COL" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="MEX" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="NLD" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="POL" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="IND" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="ITA" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="CHE" geoAssocTypeId="REGIONS"
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>> +    <CountryAddressFormat geoId="FRA" geoAssocTypeId=""
>> requireStateProvinceId="" requirePostalCode="" postalCodeRegex=""
>> hasPostalCodeExt="" requirePostalCodeExt="" addressFormat=""/>
>>  </entity-engine-xml>