svn commit: r1526298 - in /ofbiz/trunk/framework: common/entitydef/entitymodel.xml webapp/entitydef/entitymodel.xml

[adrianc]

Author: adrianc
Date: Wed Sep 25 20:51:33 2013
New Revision: 1526298

URL: http://svn.apache.org/r1526298
Log:
Remove dependency of webapp component on geo-related entities. This will make it easier to exclude geo-related functionality in a framework-only installation.

Modified:
    ofbiz/trunk/framework/common/entitydef/entitymodel.xml
    ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml

Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=1526298&r1=1526297&r2=1526298&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Wed Sep 25 20:51:33 2013
@@ -304,7 +304,17 @@ under the License.
         <key-map field-name="parentTypeId" rel-field-name="geoTypeId"/>
       </relation>
     </entity>
-
+    <extend-entity entity-name="Visit">
+        <field name="clientIpStateProvGeoId" type="id"></field>
+        <field name="clientIpCountryGeoId" type="id"></field>
+        <relation type="one" fk-name="VISIT_CIP_STPRV" title="ClientIpStateProv" rel-entity-name="Geo">
+            <key-map field-name="clientIpStateProvGeoId" rel-field-name="geoId"/>
+        </relation>
+        <relation type="one" fk-name="VISIT_CIP_CNTRY" title="ClientIpCountry" rel-entity-name="Geo">
+            <key-map field-name="clientIpCountryGeoId" rel-field-name="geoId"/>
+        </relation>
+    </extend-entity>
+
   <!-- ========================================================= -->
   <!-- org.ofbiz.common.keyword -->
   <!-- ========================================================= -->

Modified: ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml?rev=1526298&r1=1526297&r2=1526298&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml Wed Sep 25 20:51:33 2013
@@ -180,8 +180,6 @@ under the License.
         <field name="clientUser" type="short-varchar"></field>
         <field name="clientIpIspName" type="short-varchar"></field>
         <field name="clientIpPostalCode" type="short-varchar"></field>
-        <field name="clientIpStateProvGeoId" type="id"></field>
-        <field name="clientIpCountryGeoId" type="id"></field>
         <field name="cookie" type="short-varchar"></field>
         <field name="fromDate" type="date-time"></field>
         <field name="thruDate" type="date-time"></field>
@@ -192,12 +190,6 @@ under the License.
         <relation type="one" fk-name="VISIT_USER_AGNT" rel-entity-name="UserAgent">
             <key-map field-name="userAgentId"/>
         </relation>
-        <relation type="one" fk-name="VISIT_CIP_STPRV" title="ClientIpStateProv" rel-entity-name="Geo">
-            <key-map field-name="clientIpStateProvGeoId" rel-field-name="geoId"/>
-        </relation>
-        <relation type="one" fk-name="VISIT_CIP_CNTRY" title="ClientIpCountry" rel-entity-name="Geo">
-            <key-map field-name="clientIpCountryGeoId" rel-field-name="geoId"/>
-        </relation>
         <index name="VISIT_THRU_IDX" unique="false">
             <index-field name="thruDate"/>
         </index>