svn commit: r431012 - in /incubator/ofbiz/trunk: applications/party/entitydef/entitymodel.xml applications/product/entitydef/entitymodel.xml framework/webapp/entitydef/entitymodel.xml

[jonesde]

Author: jonesde
Date: Sat Aug 12 04:13:24 2006
New Revision: 431012

URL: http://svn.apache.org/viewvc?rev=431012&view=rev
Log:
Moved over a couple more fields from framework entities to extend-entity elements in applications to resolve dependencies

Modified:
    incubator/ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml

Modified: incubator/ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=431012&r1=431011&r2=431012&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/party/entitydef/entitymodel.xml Sat Aug 12 04:13:24 2006
@@ -1963,6 +1963,12 @@
             <key-map field-name="internalContentId" rel-field-name="contentId"/>
         </relation>
     </extend-entity>
+    <extend-entity entity-name="ServerHitBin">
+        <field name="internalContentId" type="id"></field>
+        <relation type="one" fk-name="SERVER_HBIN_CNT" rel-entity-name="Content">
+            <key-map field-name="internalContentId" rel-field-name="contentId"/>
+        </relation>
+    </extend-entity>
     <extend-entity entity-name="Visit">
         <field name="contactMechId" type="id"></field>
         <field name="partyId" type="id"></field>

Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=431012&r1=431011&r2=431012&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sat Aug 12 04:13:24 2006
@@ -3560,7 +3560,13 @@
         <key-map field-name="productCategoryId"/>
       </relation>
     </entity>
-
+    <extend-entity entity-name="WebSite">
+        <field name="productStoreId" type="id"></field>
+        <relation type="one" fk-name="WEB_SITE_PRDS" rel-entity-name="ProductStore">
+            <key-map field-name="productStoreId"/>
+        </relation>
+    </extend-entity>
+    
     <!-- ========================================================= -->
     <!-- org.ofbiz.product.subscription -->
     <!-- ========================================================= -->

Modified: incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml?rev=431012&r1=431011&r2=431012&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml Sat Aug 12 04:13:24 2006
@@ -100,7 +100,6 @@
             title="Server Hit Bin Entity">
       <field name="serverHitBinId" type="id-ne"></field>
       <field name="contentId" type="id-vlong-ne"></field>
-      <field name="internalContentId" type="id"></field>
       <field name="hitTypeId" type="id-ne"></field>
       <field name="serverIpAddress" type="id"></field>
       <field name="serverHostName" type="long-varchar"></field>
@@ -114,9 +113,6 @@
       <relation type="one" fk-name="SERVER_HBIN_TYPE" rel-entity-name="ServerHitType">
         <key-map field-name="hitTypeId"/>
       </relation>
-      <relation type="one" fk-name="SERVER_HBIN_CNT" rel-entity-name="Content">
-        <key-map field-name="internalContentId" rel-field-name="contentId"/>
-      </relation>
     </entity>
     <entity entity-name="ServerHitType"
             package-name="org.ofbiz.webapp.visit"
@@ -230,7 +226,6 @@
             title="Web Site Entity">
       <field name="webSiteId" type="id-ne"></field>
       <field name="siteName" type="name"></field>
-      <field name="productStoreId" type="id"></field>
       <field name="allowProductStoreChange" type="indicator"></field>
       <field name="httpHost" type="long-varchar"></field>
       <field name="httpPort" type="very-short"></field>
@@ -241,9 +236,5 @@
       <field name="secureContentPrefix" type="url"></field>
       <field name="cookieDomain" type="long-varchar"></field>
       <prim-key field="webSiteId"/>
-      <relation type="one" fk-name="WEB_SITE_PRDS" rel-entity-name="ProductStore">
-        <key-map field-name="productStoreId"/>
-      </relation>
     </entity>
 </entitymodel>
-