This commit is throwing exceptions during data load. -Adrian
On 5/26/2012 4:56 AM, [email protected] wrote:
Author: jleroux Date: Sat May 26 03:56:52 2012 New Revision: 1342846 URL: http://svn.apache.org/viewvc?rev=1342846&view=rev Log: Thanks to Martin Kaiser report on dev ML, cleans geo data a bit Use Swiss geo data. To be consistent I have also renamed GeoData_CHE.xml to GeoData_CH.xml. While at it I also renamed GeoData_IRL.xml to GeoData_IE.xml , renamed things internally, and extracted the North Ireland geo data from it to GeoData_UK.xml where it actually belongs Added: ofbiz/trunk/framework/common/data/GeoData_CH.xml - copied unchanged from r1342843, ofbiz/trunk/framework/common/data/GeoData_CHE.xml ofbiz/trunk/framework/common/data/GeoData_IE.xml - copied, changed from r1342843, ofbiz/trunk/framework/common/data/GeoData_IRL.xml Removed: ofbiz/trunk/framework/common/data/GeoData_CHE.xml ofbiz/trunk/framework/common/data/GeoData_IRL.xml Modified: ofbiz/trunk/framework/common/data/GeoData_UK.xml ofbiz/trunk/framework/common/ofbiz-component.xml Copied: ofbiz/trunk/framework/common/data/GeoData_IE.xml (from r1342843, ofbiz/trunk/framework/common/data/GeoData_IRL.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_IE.xml?p2=ofbiz/trunk/framework/common/data/GeoData_IE.xml&p1=ofbiz/trunk/framework/common/data/GeoData_IRL.xml&r1=1342843&r2=1342846&rev=1342846&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/GeoData_IRL.xml (original) +++ ofbiz/trunk/framework/common/data/GeoData_IE.xml Sat May 26 03:56:52 2012 @@ -19,73 +19,57 @@ under the License. --> <entity-engine-xml> -<!-- Counties of EIRE --> -<Geo abbreviation="CRLW" geoCode="CRLW" geoId="IRL-CRLW" geoName="Carlow" geoTypeId="COUNTY"/> -<Geo abbreviation="CAVN" geoCode="CAVN" geoId="IRL-CAVN" geoName="Cavan" geoTypeId="COUNTY"/> -<Geo abbreviation="CLARE" geoCode="CLARE" geoId="IRL-CLARE" geoName="Clare" geoTypeId="COUNTY"/> -<Geo abbreviation="CORK" geoCode="CORK" geoId="IRL-CORK" geoName="Cork" geoTypeId="COUNTY"/> -<Geo abbreviation="DNGL" geoCode="DNGL" geoId="IRL-DNGL" geoName="Donegal" geoTypeId="COUNTY"/> -<Geo abbreviation="DBLN" geoCode="DBLN" geoId="IRL-DBLN" geoName="Dublin" geoTypeId="COUNTY"/> -<Geo abbreviation="GALW" geoCode="GALW" geoId="IRL-GALW" geoName="Galway" geoTypeId="COUNTY"/> -<Geo abbreviation="KERRY" geoCode="KERRY" geoId="IRL-KERRY" geoName="Kerry" geoTypeId="COUNTY"/> -<Geo abbreviation="KLDR" geoCode="KLDR" geoId="IRL-KLDR" geoName="Kildare" geoTypeId="COUNTY"/> -<Geo abbreviation="KLKNY" geoCode="KLKNY" geoId="IRL-KLKNY" geoName="Kilkenny" geoTypeId="COUNTY"/> -<Geo abbreviation="LAOIS" geoCode="LAOIS" geoId="IRL-LAOIS" geoName="Laois" geoTypeId="COUNTY"/> -<Geo abbreviation="LTRM" geoCode="LTRM" geoId="IRL-LTRM" geoName="Leitrim" geoTypeId="COUNTY"/> -<Geo abbreviation="LMRK" geoCode="LMRK" geoId="IRL-LMRK" geoName="Limerick" geoTypeId="COUNTY"/> -<Geo abbreviation="LGFD" geoCode="LGFD" geoId="IRL-LGFD" geoName="Longford" geoTypeId="COUNTY"/> -<Geo abbreviation="LOUTH" geoCode="LOUTH" geoId="IRL-LOUTH" geoName="Louth" geoTypeId="COUNTY"/> -<Geo abbreviation="MAYO" geoCode="MAYO" geoId="IRL-MAYO" geoName="Mayo" geoTypeId="COUNTY"/> -<Geo abbreviation="MEATH" geoCode="MEATH" geoId="IRL-MEATH" geoName="Meath" geoTypeId="COUNTY"/> -<Geo abbreviation="MNGHN" geoCode="MNGHN" geoId="IRL-MNGHN" geoName="Monaghan" geoTypeId="COUNTY"/> -<Geo abbreviation="OFLY" geoCode="OFLY" geoId="IRL-OFLY" geoName="Offaly" geoTypeId="COUNTY"/> -<Geo abbreviation="RSCMN" geoCode="RSCMN" geoId="IRL-RSCMN" geoName="Roscommon" geoTypeId="COUNTY"/> -<Geo abbreviation="SLIGO" geoCode="SLIGO" geoId="IRL-SLIGO" geoName="Sligo" geoTypeId="COUNTY"/> -<Geo abbreviation="TPRY" geoCode="TPRY" geoId="IRL-TPRY" geoName="Tipperary" geoTypeId="COUNTY"/> -<Geo abbreviation="WTFD" geoCode="WTFD" geoId="IRL-WTFD" geoName="Waterford" geoTypeId="COUNTY"/> -<Geo abbreviation="WMETH" geoCode="WMETH" geoId="IRL-WMETH" geoName="West Meath" geoTypeId="COUNTY"/> -<Geo abbreviation="WXFD" geoCode="WXFD" geoId="IRL-WXFD" geoName="Wexford" geoTypeId="COUNTY"/> -<Geo abbreviation="WKLW" geoCode="WKLW" geoId="IRL-WKLW" geoName="Wicklow" geoTypeId="COUNTY"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-CRLW" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-CAVN" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-CLARE" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-CORK" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-DNGL" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-DBLN" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-GALW" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-KERRY" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-KLDR" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-KLKNY" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-LAOIS" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-LTRM" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-LMRK" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-LGFD" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-LOUTH" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-MAYO" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-MEATH" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-MNGHN" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-OFLY" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-RSCMN" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-SLIGO" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-TPRY" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-WTFD" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-WMETH" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-WXFD" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="IRL" geoIdTo="IRL-WKLW" geoAssocTypeId="REGIONS"/> -<!-- End of EIRE --> +<Geo abbreviation="CRLW" geoCode="CRLW" geoId="IE-CRLW" geoName="Carlow" geoTypeId="COUNTY"/> +<Geo abbreviation="CAVN" geoCode="CAVN" geoId="IE-CAVN" geoName="Cavan" geoTypeId="COUNTY"/> +<Geo abbreviation="CLARE" geoCode="CLARE" geoId="IE-CLARE" geoName="Clare" geoTypeId="COUNTY"/> +<Geo abbreviation="CORK" geoCode="CORK" geoId="IE-CORK" geoName="Cork" geoTypeId="COUNTY"/> +<Geo abbreviation="DNGL" geoCode="DNGL" geoId="IE-DNGL" geoName="Donegal" geoTypeId="COUNTY"/> +<Geo abbreviation="DBLN" geoCode="DBLN" geoId="IE-DBLN" geoName="Dublin" geoTypeId="COUNTY"/> +<Geo abbreviation="GALW" geoCode="GALW" geoId="IE-GALW" geoName="Galway" geoTypeId="COUNTY"/> +<Geo abbreviation="KERRY" geoCode="KERRY" geoId="IE-KERRY" geoName="Kerry" geoTypeId="COUNTY"/> +<Geo abbreviation="KLDR" geoCode="KLDR" geoId="IE-KLDR" geoName="Kildare" geoTypeId="COUNTY"/> +<Geo abbreviation="KLKNY" geoCode="KLKNY" geoId="IE-KLKNY" geoName="Kilkenny" geoTypeId="COUNTY"/> +<Geo abbreviation="LAOIS" geoCode="LAOIS" geoId="IE-LAOIS" geoName="Laois" geoTypeId="COUNTY"/> +<Geo abbreviation="LTRM" geoCode="LTRM" geoId="IE-LTRM" geoName="Leitrim" geoTypeId="COUNTY"/> +<Geo abbreviation="LMRK" geoCode="LMRK" geoId="IE-LMRK" geoName="Limerick" geoTypeId="COUNTY"/> +<Geo abbreviation="LGFD" geoCode="LGFD" geoId="IE-LGFD" geoName="Longford" geoTypeId="COUNTY"/> +<Geo abbreviation="LOUTH" geoCode="LOUTH" geoId="IE-LOUTH" geoName="Louth" geoTypeId="COUNTY"/> +<Geo abbreviation="MAYO" geoCode="MAYO" geoId="IE-MAYO" geoName="Mayo" geoTypeId="COUNTY"/> +<Geo abbreviation="MEATH" geoCode="MEATH" geoId="IE-MEATH" geoName="Meath" geoTypeId="COUNTY"/> +<Geo abbreviation="MNGHN" geoCode="MNGHN" geoId="IE-MNGHN" geoName="Monaghan" geoTypeId="COUNTY"/> +<Geo abbreviation="OFLY" geoCode="OFLY" geoId="IE-OFLY" geoName="Offaly" geoTypeId="COUNTY"/> +<Geo abbreviation="RSCMN" geoCode="RSCMN" geoId="IE-RSCMN" geoName="Roscommon" geoTypeId="COUNTY"/> +<Geo abbreviation="SLIGO" geoCode="SLIGO" geoId="IE-SLIGO" geoName="Sligo" geoTypeId="COUNTY"/> +<Geo abbreviation="TPRY" geoCode="TPRY" geoId="IE-TPRY" geoName="Tipperary" geoTypeId="COUNTY"/> +<Geo abbreviation="WTFD" geoCode="WTFD" geoId="IE-WTFD" geoName="Waterford" geoTypeId="COUNTY"/> +<Geo abbreviation="WMETH" geoCode="WMETH" geoId="IE-WMETH" geoName="West Meath" geoTypeId="COUNTY"/> +<Geo abbreviation="WXFD" geoCode="WXFD" geoId="IE-WXFD" geoName="Wexford" geoTypeId="COUNTY"/> +<Geo abbreviation="WKLW" geoCode="WKLW" geoId="IE-WKLW" geoName="Wicklow" geoTypeId="COUNTY"/> +<GeoAssoc geoId="IE" geoIdTo="IE-CRLW" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-CAVN" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-CLARE" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-CORK" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-DNGL" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-DBLN" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-GALW" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-KERRY" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-KLDR" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-KLKNY" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-LAOIS" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-LTRM" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-LMRK" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-LGFD" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-LOUTH" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-MAYO" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-MEATH" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-MNGHN" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-OFLY" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-RSCMN" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-SLIGO" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-TPRY" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-WTFD" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-WMETH" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-WXFD" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="IE" geoIdTo="IE-WKLW" geoAssocTypeId="REGIONS"/> -<!-- Counties of N.Ireland --> -<Geo abbreviation="ATRM" geoCode="ATRM" geoId="NIRL-ATRM" geoName="Antrim" geoTypeId="COUNTY"/> -<Geo abbreviation="ARMG" geoCode="ARMG" geoId="NIRL-ARMG" geoName="Armagh" geoTypeId="COUNTY"/> -<Geo abbreviation="DOWN" geoCode="DOWN" geoId="NIRL-DOWN" geoName="Down" geoTypeId="COUNTY"/> -<Geo abbreviation="FMNH" geoCode="FMNH" geoId="NIRL-FMNH" geoName="Fermanagh" geoTypeId="COUNTY"/> -<Geo abbreviation="LDRY" geoCode="LDRY" geoId="NIRL-LDRY" geoName="Londonderry" geoTypeId="COUNTY"/> -<Geo abbreviation="TYR" geoCode="TYR" geoId="NIRL-TYR" geoName="Tyrone" geoTypeId="COUNTY"/> -<GeoAssoc geoId="NIRL" geoIdTo="NIRL-ATRM" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="NIRL" geoIdTo="NIRL-ARMG" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="NIRL" geoIdTo="NIRL-DOWN" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="NIRL" geoIdTo="NIRL-FMNH" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="NIRL" geoIdTo="NIRL-LDRY" geoAssocTypeId="REGIONS"/> -<GeoAssoc geoId="NIRL" geoIdTo="NIRL-TYR" geoAssocTypeId="REGIONS"/> -<!-- End of N.Ireland --> </entity-engine-xml> Modified: ofbiz/trunk/framework/common/data/GeoData_UK.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_UK.xml?rev=1342846&r1=1342845&r2=1342846&view=diff ============================================================================== --- ofbiz/trunk/framework/common/data/GeoData_UK.xml (original) +++ ofbiz/trunk/framework/common/data/GeoData_UK.xml Sat May 26 03:56:52 2012 @@ -191,4 +191,20 @@ under the License. <GeoAssoc geoId="WALS" geoIdTo="GB-PMBRK" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="WALS" geoIdTo="GB-RNRS" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="SCOT" geoIdTo="GB-WLOTH" geoAssocTypeId="REGIONS"/> + +<!-- Counties of N.Ireland --> +<Geo abbreviation="ATRM" geoCode="ATRM" geoId="NIRL-ATRM" geoName="Antrim" geoTypeId="COUNTY"/> +<Geo abbreviation="ARMG" geoCode="ARMG" geoId="NIRL-ARMG" geoName="Armagh" geoTypeId="COUNTY"/> +<Geo abbreviation="DOWN" geoCode="DOWN" geoId="NIRL-DOWN" geoName="Down" geoTypeId="COUNTY"/> +<Geo abbreviation="FMNH" geoCode="FMNH" geoId="NIRL-FMNH" geoName="Fermanagh" geoTypeId="COUNTY"/> +<Geo abbreviation="LDRY" geoCode="LDRY" geoId="NIRL-LDRY" geoName="Londonderry" geoTypeId="COUNTY"/> +<Geo abbreviation="TYR" geoCode="TYR" geoId="NIRL-TYR" geoName="Tyrone" geoTypeId="COUNTY"/> +<GeoAssoc geoId="NIRL" geoIdTo="NIRL-ATRM" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="NIRL" geoIdTo="NIRL-ARMG" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="NIRL" geoIdTo="NIRL-DOWN" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="NIRL" geoIdTo="NIRL-FMNH" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="NIRL" geoIdTo="NIRL-LDRY" geoAssocTypeId="REGIONS"/> +<GeoAssoc geoId="NIRL" geoIdTo="NIRL-TYR" geoAssocTypeId="REGIONS"/> +<!-- End of N.Ireland --> + </entity-engine-xml> Modified: ofbiz/trunk/framework/common/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/ofbiz-component.xml?rev=1342846&r1=1342845&r2=1342846&view=diff ============================================================================== --- ofbiz/trunk/framework/common/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/common/ofbiz-component.xml Sat May 26 03:56:52 2012 @@ -38,19 +38,20 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_BG.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_BR.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CA.xml"/> +<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CH.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CN.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_CO.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_DE.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_ES.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_FR.xml"/> -<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IT.xml"/> +<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IE.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IN.xml"/> -<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IRL.xml"/> +<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IT.xml"/> +<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MX.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_NL.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_PL.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_UK.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_US.xml"/> -<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MX.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/LanguageData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/UnitData.xml"/>
