Author: jleroux
Date: Wed Aug 31 03:02:24 2011
New Revision: 1163475
URL: http://svn.apache.org/viewvc?rev=1163475&view=rev
Log:
Splits USA , Mexico and Canada geo data. I let USCAN and USMEXCAN in US file, I
put MEXCAN in MX file
Added:
ofbiz/trunk/framework/common/data/GeoData_CA.xml (with props)
Modified:
ofbiz/trunk/framework/common/data/GeoData_MX.xml
ofbiz/trunk/framework/common/data/GeoData_US.xml
ofbiz/trunk/framework/common/ofbiz-component.xml
Added: ofbiz/trunk/framework/common/data/GeoData_CA.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_CA.xml?rev=1163475&view=auto
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_CA.xml (added)
+++ ofbiz/trunk/framework/common/data/GeoData_CA.xml Wed Aug 31 03:02:24 2011
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+ <Geo abbreviation="AB" geoCode="AB" geoId="AB" geoName="Alberta"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="BC" geoCode="BC" geoId="BC" geoName="British Columbia"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="MB" geoCode="MB" geoId="MB" geoName="Manitoba"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NB" geoCode="NB" geoId="NB" geoName="New Brunswick"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NL" geoCode="NL" geoId="NL" geoName="Newfoundland and
Labrador" geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NS" geoCode="NS" geoId="NS" geoName="Nova Scotia"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NT" geoCode="NT" geoId="NT" geoName="Northwest
Territories" geoTypeId="PROVINCE"/>
+ <Geo abbreviation="NU" geoCode="NU" geoId="NU" geoName="Nunavut"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="ON" geoCode="ON" geoId="ON" geoName="Ontario"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="PE" geoCode="PE" geoId="PE" geoName="Prince Edward
Island" geoTypeId="PROVINCE"/>
+ <Geo abbreviation="QC" geoCode="QC" geoId="QC" geoName="Quebec"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Saskatchewan"
geoTypeId="PROVINCE"/>
+ <Geo abbreviation="YT" geoCode="YT" geoId="YT" geoName="Yukon"
geoTypeId="PROVINCE"/>
+
+ <GeoAssoc geoId="CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/>
+
+</entity-engine-xml>
+
Propchange: ofbiz/trunk/framework/common/data/GeoData_CA.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/common/data/GeoData_CA.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/framework/common/data/GeoData_CA.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/framework/common/data/GeoData_MX.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_MX.xml?rev=1163475&r1=1163474&r2=1163475&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_MX.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_MX.xml Wed Aug 31 03:02:24 2011
@@ -84,4 +84,9 @@ under the License.
<GeoAssoc geoId="MEX" geoIdTo="MX-VE" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="MEX" geoIdTo="MX-YU" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="MEX" geoIdTo="MX-ZA" geoAssocTypeId="REGIONS"/>
+
+ <Geo abbreviation="MEXCAN" geoCode="MEXCAN" geoId="MEXCAN"
geoName="Mexico/Canada" geoTypeId="GROUP"/>
+ <GeoAssoc geoId="MEX" geoIdTo="MEXCAN" geoAssocTypeId="GROUP_MEMBER"/>
+ <GeoAssoc geoId="CAN" geoIdTo="MEXCAN" geoAssocTypeId="GROUP_MEMBER"/>
+
</entity-engine-xml>
Modified: ofbiz/trunk/framework/common/data/GeoData_US.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_US.xml?rev=1163475&r1=1163474&r2=1163475&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_US.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_US.xml Wed Aug 31 03:02:24 2011
@@ -143,34 +143,6 @@ under the License.
<GeoAssoc geoId="USA" geoIdTo="AE" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="USA" geoIdTo="AP" geoAssocTypeId="REGIONS"/>
- <Geo abbreviation="AB" geoCode="AB" geoId="AB" geoName="Alberta"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="BC" geoCode="BC" geoId="BC" geoName="British Columbia"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="MB" geoCode="MB" geoId="MB" geoName="Manitoba"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="NB" geoCode="NB" geoId="NB" geoName="New Brunswick"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="NL" geoCode="NL" geoId="NL" geoName="Newfoundland and
Labrador" geoTypeId="PROVINCE"/>
- <Geo abbreviation="NS" geoCode="NS" geoId="NS" geoName="Nova Scotia"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="NT" geoCode="NT" geoId="NT" geoName="Northwest
Territories" geoTypeId="PROVINCE"/>
- <Geo abbreviation="NU" geoCode="NU" geoId="NU" geoName="Nunavut"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="ON" geoCode="ON" geoId="ON" geoName="Ontario"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="PE" geoCode="PE" geoId="PE" geoName="Prince Edward
Island" geoTypeId="PROVINCE"/>
- <Geo abbreviation="QC" geoCode="QC" geoId="QC" geoName="Quebec"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Saskatchewan"
geoTypeId="PROVINCE"/>
- <Geo abbreviation="YT" geoCode="YT" geoId="YT" geoName="Yukon"
geoTypeId="PROVINCE"/>
-
- <GeoAssoc geoId="CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/>
-
<Geo abbreviation="USAF" geoCode="USAF" geoId="USAF" geoName="US Armed
Forces" geoTypeId="GROUP"/>
<GeoAssoc geoId="AA" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
<GeoAssoc geoId="AE" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
Modified: ofbiz/trunk/framework/common/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/ofbiz-component.xml?rev=1163475&r1=1163474&r2=1163475&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/common/ofbiz-component.xml Wed Aug 31 03:02:24 2011
@@ -36,6 +36,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main"
location="data/GeoData_AU.xml"/>
<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_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"/>
