svn commit: r1526296 - in /ofbiz/trunk/framework/common/data: CommonTypeData.xml GeoData.xml

[adrianc]

Author: adrianc
Date: Wed Sep 25 20:46:40 2013
New Revision: 1526296

URL: http://svn.apache.org/r1526296
Log:
Move geo-related seed data to the GeoData.xml file. No functional change.

Modified:
    ofbiz/trunk/framework/common/data/CommonTypeData.xml
    ofbiz/trunk/framework/common/data/GeoData.xml

Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=1526296&r1=1526295&r2=1526296&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Wed Sep 25 20:46:40 2013
@@ -64,26 +64,6 @@ under the License.
     <Enumeration description="Lang: Spanish" enumCode="LANG_SP" enumId="KWTR_LANG_SP" sequenceId="21" enumTypeId="KW_THES_REL"/>
     <Enumeration description="Lang: French" enumCode="LANG_FR" enumId="KWTR_LANG_FR" sequenceId="22" enumTypeId="KW_THES_REL"/>
 
-    <GeoType description="City" geoTypeId="CITY" hasTable="N" parentTypeId=""/>
-    <GeoType description="Group" geoTypeId="GROUP" hasTable="N" parentTypeId=""/>
-    <GeoType description="State" geoTypeId="STATE" hasTable="N" parentTypeId=""/>
-    <GeoType description="Postal Code" geoTypeId="POSTAL_CODE" hasTable="N" parentTypeId=""/>
-    <GeoType description="Country" geoTypeId="COUNTRY" hasTable="N" parentTypeId=""/>
-    <GeoType description="County" geoTypeId="COUNTY" hasTable="N" parentTypeId=""/>
-    <GeoType description="County-City" geoTypeId="COUNTY_CITY" hasTable="N" parentTypeId=""/>
-    <GeoType description="Municipality" geoTypeId="MUNICIPALITY" hasTable="N" parentTypeId=""/>
-    <GeoType description="Province" geoTypeId="PROVINCE" hasTable="N" parentTypeId=""/>
-    <GeoType description="Region" geoTypeId="REGION" hasTable="N" parentTypeId=""/>
-    <GeoType description="Territory" geoTypeId="TERRITORY" hasTable="N" parentTypeId=""/>
-    <GeoType description="Sales Territory" geoTypeId="SALES_TERRITORY" hasTable="N" parentTypeId="TERRITORY"/>
-    <GeoType description="Service Territory" geoTypeId="SERVICE_TERRITORY" hasTable="N" parentTypeId="TERRITORY"/>
-
-    <GeoAssocType geoAssocTypeId="GROUP_MEMBER" description="Geo Group Member"/>
-    <GeoAssocType geoAssocTypeId="REGIONS" description="For a region of a larger Geo, i.e. states, counties, provinces..."/>
-    <GeoAssocType geoAssocTypeId="COUNTY_CITY" description="City in a county"/>
-    <GeoAssocType geoAssocTypeId="COUNTY_SEAT" description="Administrative Main City of a County"/>
-    <GeoAssocType geoAssocTypeId="POSTAL_CODE" description="Postal code associated to a GeoType"/>
-
     <!-- sync status -->
     <StatusType description="Synchronize" hasTable="N" parentTypeId="" statusTypeId="SYNCHRONIZE_STATUS"/>
     <StatusItem description="Not-Synchronized" sequenceId="01" statusCode="NOT_SYNCHRONIZED" statusId="NOT_SYNCHRONIZED" statusTypeId="SYNCHRONIZE_STATUS"/>

Modified: ofbiz/trunk/framework/common/data/GeoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData.xml?rev=1526296&r1=1526295&r2=1526296&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData.xml Wed Sep 25 20:46:40 2013
@@ -19,6 +19,27 @@ under the License.
 -->
 
 <entity-engine-xml>
+
+    <GeoType description="City" geoTypeId="CITY" hasTable="N" parentTypeId=""/>
+    <GeoType description="Group" geoTypeId="GROUP" hasTable="N" parentTypeId=""/>
+    <GeoType description="State" geoTypeId="STATE" hasTable="N" parentTypeId=""/>
+    <GeoType description="Postal Code" geoTypeId="POSTAL_CODE" hasTable="N" parentTypeId=""/>
+    <GeoType description="Country" geoTypeId="COUNTRY" hasTable="N" parentTypeId=""/>
+    <GeoType description="County" geoTypeId="COUNTY" hasTable="N" parentTypeId=""/>
+    <GeoType description="County-City" geoTypeId="COUNTY_CITY" hasTable="N" parentTypeId=""/>
+    <GeoType description="Municipality" geoTypeId="MUNICIPALITY" hasTable="N" parentTypeId=""/>
+    <GeoType description="Province" geoTypeId="PROVINCE" hasTable="N" parentTypeId=""/>
+    <GeoType description="Region" geoTypeId="REGION" hasTable="N" parentTypeId=""/>
+    <GeoType description="Territory" geoTypeId="TERRITORY" hasTable="N" parentTypeId=""/>
+    <GeoType description="Sales Territory" geoTypeId="SALES_TERRITORY" hasTable="N" parentTypeId="TERRITORY"/>
+    <GeoType description="Service Territory" geoTypeId="SERVICE_TERRITORY" hasTable="N" parentTypeId="TERRITORY"/>
+
+    <GeoAssocType geoAssocTypeId="GROUP_MEMBER" description="Geo Group Member"/>
+    <GeoAssocType geoAssocTypeId="REGIONS" description="For a region of a larger Geo, i.e. states, counties, provinces..."/>
+    <GeoAssocType geoAssocTypeId="COUNTY_CITY" description="City in a county"/>
+    <GeoAssocType geoAssocTypeId="COUNTY_SEAT" description="Administrative Main City of a County"/>
+    <GeoAssocType geoAssocTypeId="POSTAL_CODE" description="Postal code associated to a GeoType"/>
+
     <!--
         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.