svn commit: r631868 - in /ofbiz/trunk/applications: content/entitydef/entitygroup.xml content/entitydef/entitymodel.xml party/entitydef/entitygroup.xml party/entitydef/entitymodel.xml product/entitydef/entitygroup.xml product/entitydef/entitymodel.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r631868 - in /ofbiz/trunk/applications: content/entitydef/entitygroup.xml content/entitydef/entitymodel.xml party/entitydef/entitygroup.xml party/entitydef/entitymodel.xml product/entitydef/entitygroup.xml product/entitydef/entitymodel.xml

jonesde
Author: jonesde
Date: Wed Feb 27 22:37:12 2008
New Revision: 631868

URL: http://svn.apache.org/viewvc?rev=631868&view=rev
Log:
Reformat and repackage (move around) various entities to clean up as part of a review; no functional changes

Modified:
    ofbiz/trunk/applications/content/entitydef/entitygroup.xml
    ofbiz/trunk/applications/content/entitydef/entitymodel.xml
    ofbiz/trunk/applications/party/entitydef/entitygroup.xml
    ofbiz/trunk/applications/party/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/entitydef/entitygroup.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/content/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitygroup.xml?rev=631868&r1=631867&r2=631868&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitygroup.xml Wed Feb 27 22:37:12 2008
@@ -128,6 +128,7 @@
     <entity-group group="org.ofbiz" entity="WebSiteContentType" />
     <entity-group group="org.ofbiz" entity="WebSitePathAlias" />
     <entity-group group="org.ofbiz" entity="WebSitePublishPoint" />
-
+    <entity-group group="org.ofbiz" entity="WebSiteRole" />
+    
 </entitygroup>
 

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=631868&r1=631867&r2=631868&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Wed Feb 27 22:37:12 2008
@@ -1568,4 +1568,35 @@
             <key-map field-name="contentId" />
         </relation>
     </entity>
+    <entity entity-name="WebSiteRole" package-name="org.ofbiz.party.party" title="WebSite Role Association Entity">
+        <field name="partyId" type="id-ne"></field>
+        <field name="roleTypeId" type="id-ne"></field>
+        <field name="webSiteId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="sequenceNum" type="numeric"></field>
+        <prim-key field="partyId"/>
+        <prim-key field="roleTypeId"/>
+        <prim-key field="webSiteId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one-nofk" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="RoleType">
+            <key-map field-name="roleTypeId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="Person">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="PartyGroup">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="WSRLE_PTYRLE" rel-entity-name="PartyRole">
+            <key-map field-name="partyId"/>
+            <key-map field-name="roleTypeId"/>
+        </relation>
+        <relation type="one" fk-name="WSRLE_WSITE" rel-entity-name="WebSite">
+            <key-map field-name="webSiteId"/>
+        </relation>
+    </entity>
 </entitymodel>

Modified: ofbiz/trunk/applications/party/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitygroup.xml?rev=631868&r1=631867&r2=631868&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitygroup.xml Wed Feb 27 22:37:12 2008
@@ -56,9 +56,11 @@
     <entity-group group="org.ofbiz" entity="CommContentAssocType" />
     <entity-group group="org.ofbiz" entity="CommEventContentDataResource" />
     <entity-group group="org.ofbiz" entity="CommunicationEvent" />
+    <entity-group group="org.ofbiz" entity="CommunicationEventAndProduct" />
+    <entity-group group="org.ofbiz" entity="CommunicationEventAndSubscr" />
     <entity-group group="org.ofbiz" entity="CommunicationEventPrpTyp" />
     <entity-group group="org.ofbiz" entity="CommunicationEventPurpose" />
-    <entity-group group="org.ofbiz" entity="CommunicationEventAndSubscr" />
+    <entity-group group="org.ofbiz" entity="CommunicationEventProduct" />
     <entity-group group="org.ofbiz" entity="CommunicationEventRole" />
     <entity-group group="org.ofbiz" entity="CommunicationEventType" />
     <entity-group group="org.ofbiz" entity="CommunicationEventAndRole" />
@@ -100,7 +102,6 @@
   <!-- org.ofbiz.party.party -->
   <!-- ========================================================= -->
 
-
     <entity-group group="org.ofbiz" entity="AddressMatchMap" />        
     <entity-group group="org.ofbiz" entity="Affiliate" />
     <entity-group group="org.ofbiz" entity="Party" />
@@ -148,5 +149,4 @@
     <entity-group group="org.ofbiz" entity="RoleTypeAndParty" />
     <entity-group group="org.ofbiz" entity="RoleTypeAttr" />
     <entity-group group="org.ofbiz" entity="Vendor" />
-    <entity-group group="org.ofbiz" entity="WebSiteRole" />
 </entitygroup>

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=631868&r1=631867&r2=631868&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Wed Feb 27 22:37:12 2008
@@ -560,100 +560,103 @@
         </relation>
     </view-entity>
     <entity entity-name="CommunicationEvent" package-name="org.ofbiz.party.communication" title="Communication Event Entity">
-      <field name="communicationEventId" type="id-ne"></field>
-      <field name="communicationEventTypeId" type="id"></field>
-      <field name="origCommEventId" type="id"></field>
-      <field name="parentCommEventId" type="id"></field>
-      <field name="statusId" type="id"></field>
-      <field name="contactMechTypeId" type="id"></field>
-      <field name="contactMechIdFrom" type="id"/>
-      <field name="contactMechIdTo" type="id"/>
-      <field name="roleTypeIdFrom" type="id"></field>
-      <field name="roleTypeIdTo" type="id"></field>
-      <field name="partyIdFrom" type="id"></field>
-      <field name="partyIdTo" type="id"></field>
-      <field name="entryDate" type="date-time"></field>
-      <field name="datetimeStarted" type="date-time"></field>
-      <field name="datetimeEnded" type="date-time"></field>
-      <field name="subject" type="long-varchar"></field>
-      <field name="contentMimeTypeId" type="id-long"/>
-      <field name="content" type="very-long"></field>
-      <field name="note" type="comment"></field>
-      <field name="reasonEnumId" type="id"></field>
-      <field name="contactListId" type="id"></field>
-      <field name="headerString" type="very-long"></field>
-      <field name="fromString" type="very-long"></field>
-      <field name="toString" type="very-long"></field>
-      <field name="ccString" type="very-long"></field>
-      <field name="bccString" type="very-long"></field>
-      <field name="messageId" type="value"></field>
-      <prim-key field="communicationEventId"/>
-      <relation type="one" fk-name="COM_EVNT_TYPE" rel-entity-name="CommunicationEventType">
-        <key-map field-name="communicationEventTypeId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_TPTY" title="To" rel-entity-name="Party">
-        <key-map field-name="partyIdTo" rel-field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_TRTYP" title="To" rel-entity-name="RoleType">
-        <key-map field-name="roleTypeIdTo" rel-field-name="roleTypeId"/>
-      </relation>
-      <relation type="one-nofk" title="To" rel-entity-name="PartyRole">
-        <key-map field-name="partyIdTo" rel-field-name="partyId"/>
-        <key-map field-name="roleTypeIdTo" rel-field-name="roleTypeId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_FPTY" title="From" rel-entity-name="Party">
-        <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_FRTYP" title="From" rel-entity-name="RoleType">
-        <key-map field-name="roleTypeIdFrom" rel-field-name="roleTypeId"/>
-      </relation>
-      <relation type="one-nofk" title="From" rel-entity-name="PartyRole">
-        <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
-        <key-map field-name="roleTypeIdFrom" rel-field-name="roleTypeId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_STTS" rel-entity-name="StatusItem">
-        <key-map field-name="statusId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_CMTP" rel-entity-name="ContactMechType">
-        <key-map field-name="contactMechTypeId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_FCM" title="From" rel-entity-name="ContactMech">
-        <key-map field-name="contactMechIdFrom" rel-field-name="contactMechId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_TCM" title="To" rel-entity-name="ContactMech">
-        <key-map field-name="contactMechIdTo" rel-field-name="contactMechId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_CLST" rel-entity-name="ContactList">
-        <key-map field-name="contactListId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_MIMETYPE" rel-entity-name="MimeType">
-          <key-map field-name="contentMimeTypeId" rel-field-name="mimeTypeId"/>
-      </relation>
-      <relation type="one" fk-name="COM_EVNT_RESENUM" rel-entity-name="Enumeration">
-          <key-map field-name="reasonEnumId" rel-field-name="enumId"/>
-      </relation>
-      <index name="COMMEVT_MSG_ID" unique="true">
-          <index-field name="messageId"/>              
-      </index>
+        <field name="communicationEventId" type="id-ne"></field>
+        <field name="communicationEventTypeId" type="id"></field>
+        <field name="origCommEventId" type="id"></field>
+        <field name="parentCommEventId" type="id"></field>
+        <field name="statusId" type="id"></field>
+        <field name="contactMechTypeId" type="id"></field>
+        <field name="contactMechIdFrom" type="id"/>
+        <field name="contactMechIdTo" type="id"/>
+        <field name="roleTypeIdFrom" type="id"></field>
+        <field name="roleTypeIdTo" type="id"></field>
+        <field name="partyIdFrom" type="id"></field>
+        <field name="partyIdTo" type="id"></field>
+        <field name="entryDate" type="date-time"></field>
+        <field name="datetimeStarted" type="date-time"></field>
+        <field name="datetimeEnded" type="date-time"></field>
+        <field name="subject" type="long-varchar"></field>
+        <field name="contentMimeTypeId" type="id-long"/>
+        <field name="content" type="very-long"></field>
+        <field name="note" type="comment"></field>
+        <field name="reasonEnumId" type="id"></field>
+        <field name="contactListId" type="id"></field>
+        <field name="headerString" type="very-long"></field>
+        <field name="fromString" type="very-long"></field>
+        <field name="toString" type="very-long"></field>
+        <field name="ccString" type="very-long"></field>
+        <field name="bccString" type="very-long"></field>
+        <field name="messageId" type="value"></field>
+        <prim-key field="communicationEventId"/>
+        <relation type="one" fk-name="COM_EVNT_TYPE" rel-entity-name="CommunicationEventType">
+            <key-map field-name="communicationEventTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_TPTY" title="To" rel-entity-name="Party">
+            <key-map field-name="partyIdTo" rel-field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_TRTYP" title="To" rel-entity-name="RoleType">
+            <key-map field-name="roleTypeIdTo" rel-field-name="roleTypeId"/>
+        </relation>
+        <relation type="one-nofk" title="To" rel-entity-name="PartyRole">
+            <key-map field-name="partyIdTo" rel-field-name="partyId"/>
+            <key-map field-name="roleTypeIdTo" rel-field-name="roleTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_FPTY" title="From" rel-entity-name="Party">
+            <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_FRTYP" title="From" rel-entity-name="RoleType">
+            <key-map field-name="roleTypeIdFrom" rel-field-name="roleTypeId"/>
+        </relation>
+        <relation type="one-nofk" title="From" rel-entity-name="PartyRole">
+            <key-map field-name="partyIdFrom" rel-field-name="partyId"/>
+            <key-map field-name="roleTypeIdFrom" rel-field-name="roleTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_STTS" rel-entity-name="StatusItem">
+            <key-map field-name="statusId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_CMTP" rel-entity-name="ContactMechType">
+            <key-map field-name="contactMechTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_FCM" title="From" rel-entity-name="ContactMech">
+            <key-map field-name="contactMechIdFrom" rel-field-name="contactMechId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_TCM" title="To" rel-entity-name="ContactMech">
+            <key-map field-name="contactMechIdTo" rel-field-name="contactMechId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_CLST" rel-entity-name="ContactList">
+            <key-map field-name="contactListId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_MIMETYPE" rel-entity-name="MimeType">
+            <key-map field-name="contentMimeTypeId" rel-field-name="mimeTypeId"/>
+        </relation>
+        <relation type="one" fk-name="COM_EVNT_RESENUM" rel-entity-name="Enumeration">
+            <key-map field-name="reasonEnumId" rel-field-name="enumId"/>
+        </relation>
+        <index name="COMMEVT_MSG_ID" unique="true">
+            <index-field name="messageId"/>              
+        </index>
     </entity>
-    
-  <view-entity entity-name="CommunicationEventAndSubscr"
-    package-name="org.ofbiz.party.communication"
-    title="Communication Event And Role View Entity">
-    <member-entity entity-alias="SC" entity-name="SubscriptionCommEvent"/>
-    <member-entity entity-alias="SU" entity-name="Subscription"/>
-    <alias-all entity-alias="SC">
-      <exclude field="communicationEventId"/>
-    </alias-all>
-    <alias-all entity-alias="SU"/>
-    <view-link entity-alias="SC" rel-entity-alias="SU">
-      <key-map field-name="subscriptionId"/>
-    </view-link>
-  </view-entity>
-  
-    <view-entity entity-name="CommunicationEventAndRole"
-                 package-name="org.ofbiz.party.communication"
-                 title="Communication Event And Role View Entity">
+    <view-entity entity-name="CommunicationEventAndSubscr" package-name="org.ofbiz.party.communication" title="Communication Event And Role View Entity">
+        <member-entity entity-alias="SC" entity-name="SubscriptionCommEvent"/>
+        <member-entity entity-alias="SU" entity-name="Subscription"/>
+        <alias-all entity-alias="SC">
+            <exclude field="communicationEventId"/>
+        </alias-all>
+        <alias-all entity-alias="SU"/>
+        <view-link entity-alias="SC" rel-entity-alias="SU">
+            <key-map field-name="subscriptionId"/>
+        </view-link>
+    </view-entity>
+    <view-entity entity-name="CommunicationEventAndProduct" package-name="org.ofbiz.party.communication" title="Communication Event And Product View Entity">
+        <member-entity entity-alias="CP" entity-name="CommunicationEventProduct"/>
+        <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
+        <alias-all entity-alias="CP"/>
+        <alias-all entity-alias="CE"/>
+        <view-link entity-alias="CP" rel-entity-alias="CE">
+            <key-map field-name="communicationEventId"/>
+        </view-link>
+    </view-entity>
+    <view-entity entity-name="CommunicationEventAndRole" package-name="org.ofbiz.party.communication" title="Communication Event And Role View Entity">
       <member-entity entity-alias="CR" entity-name="CommunicationEventRole"/>
       <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
       <alias-all entity-alias="CR"/>
@@ -713,6 +716,18 @@
         <key-map field-name="communicationEventId"/>
       </relation>
     </view-entity>
+    <entity entity-name="CommunicationEventProduct" package-name="org.ofbiz.party.communication" title="Communication Event Product Entity">
+        <field name="productId" type="id-ne"></field>
+        <field name="communicationEventId" type="id-ne"></field>
+        <prim-key field="productId"/>
+        <prim-key field="communicationEventId"/>
+        <relation type="one" fk-name="COMEV_PROD_PROD" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one" fk-name="COMEV_PROD_CMEV" rel-entity-name="CommunicationEvent">
+            <key-map field-name="communicationEventId"/>
+        </relation>
+    </entity>
     <entity entity-name="CommunicationEventPrpTyp"
             package-name="org.ofbiz.party.communication"
             default-resource-name="PartyEntityLabels"
@@ -789,7 +804,6 @@
         <alias entity-alias="CE" name="partyIdTo" group-by="true"/>
     </view-entity>
 
-
   <!-- ========================================================= -->
   <!-- org.ofbiz.party.contact -->
   <!-- ========================================================= -->
@@ -2365,39 +2379,6 @@
       <relation type="one" fk-name="VENDOR_PARTY" rel-entity-name="Party">
         <key-map field-name="partyId"/>
       </relation>
-    </entity>
-    <entity entity-name="WebSiteRole"
-        package-name="org.ofbiz.party.party"
-        title="WebSite Role Association Entity">
-        <field name="partyId" type="id-ne"></field>
-        <field name="roleTypeId" type="id-ne"></field>
-        <field name="webSiteId" type="id-ne"></field>
-        <field name="fromDate" type="date-time"></field>
-        <field name="thruDate" type="date-time"></field>
-        <field name="sequenceNum" type="numeric"></field>
-        <prim-key field="partyId"/>
-        <prim-key field="roleTypeId"/>
-        <prim-key field="webSiteId"/>
-        <prim-key field="fromDate"/>
-        <relation type="one-nofk" rel-entity-name="Party">
-            <key-map field-name="partyId"/>
-        </relation>
-        <relation type="one-nofk" rel-entity-name="RoleType">
-            <key-map field-name="roleTypeId"/>
-        </relation>
-        <relation type="one-nofk" rel-entity-name="Person">
-            <key-map field-name="partyId"/>
-        </relation>
-        <relation type="one-nofk" rel-entity-name="PartyGroup">
-            <key-map field-name="partyId"/>
-        </relation>
-        <relation type="one" fk-name="WSRLE_PTYRLE" rel-entity-name="PartyRole">
-            <key-map field-name="partyId"/>
-            <key-map field-name="roleTypeId"/>
-        </relation>
-        <relation type="one" fk-name="WSRLE_WSITE" rel-entity-name="WebSite">
-            <key-map field-name="webSiteId"/>
-        </relation>
     </entity>
     <extend-entity entity-name="CustomTimePeriod">
         <field name="organizationPartyId" type="id"></field>

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?rev=631868&r1=631867&r2=631868&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Wed Feb 27 22:37:12 2008
@@ -21,9 +21,9 @@
 <entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.catalog -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.catalog -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ProdCatalog" />
     <entity-group group="org.ofbiz" entity="ProdCatalogCategory" />
@@ -31,9 +31,9 @@
     <entity-group group="org.ofbiz" entity="ProdCatalogInvFacility" />
     <entity-group group="org.ofbiz" entity="ProdCatalogRole" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.category -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.category -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ProductAndCategoryMember" />
     <entity-group group="org.ofbiz" entity="ProductCategory" />
@@ -67,18 +67,44 @@
     <entity-group group="org.ofbiz" entity="ProductConfigConfig" />
     <entity-group group="org.ofbiz" entity="ProductConfigStats" />
     
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.cost -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.cost -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="CostComponent" />
     <entity-group group="org.ofbiz" entity="CostComponentAttribute" />
     <entity-group group="org.ofbiz" entity="CostComponentType" />
     <entity-group group="org.ofbiz" entity="CostComponentTypeAttr" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.feature -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.facility -->
+    <!-- ========================================================= -->
+    
+    <entity-group group="org.ofbiz" entity="Container" />
+    <entity-group group="org.ofbiz" entity="ContainerType" />
+    <entity-group group="org.ofbiz" entity="Facility" />
+    <entity-group group="org.ofbiz" entity="FacilityAndContactMech" />
+    <entity-group group="org.ofbiz" entity="FacilityAttribute" />
+    <entity-group group="org.ofbiz" entity="FacilityCarrierShipment" />
+    <entity-group group="org.ofbiz" entity="FacilityContactMech" />
+    <entity-group group="org.ofbiz" entity="FacilityContactMechPurpose" />
+    <entity-group group="org.ofbiz" entity="FacilityGroup" />
+    <entity-group group="org.ofbiz" entity="FacilityGroupMember" />
+    <entity-group group="org.ofbiz" entity="FacilityGroupRole" />
+    <entity-group group="org.ofbiz" entity="FacilityGroupRollup" />
+    <entity-group group="org.ofbiz" entity="FacilityGroupType" />
+    <entity-group group="org.ofbiz" entity="FacilityLocation" />
+    <entity-group group="org.ofbiz" entity="FacilityRole" />
+    <entity-group group="org.ofbiz" entity="FacilityType" />
+    <entity-group group="org.ofbiz" entity="FacilityTypeAttr" />
+    <entity-group group="org.ofbiz" entity="ProductFacility" />
+    <entity-group group="org.ofbiz" entity="ProductFacilityLocation" />
+    <entity-group group="org.ofbiz" entity="ProductFacilityLocationView" />
+    <entity-group group="org.ofbiz" entity="ProductFacilityLocationQuantityTest" />
+    
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.feature -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ProductFeature" />
     <entity-group group="org.ofbiz" entity="ProductFeatureAndAppl" />
@@ -97,9 +123,9 @@
     <entity-group group="org.ofbiz" entity="ProductFeatureIactnType" />
     <entity-group group="org.ofbiz" entity="ProductFeatureType" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.inventory -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.inventory -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="InventoryItem" />
     <entity-group group="org.ofbiz" entity="InventoryItemAndLocation" />
@@ -123,18 +149,9 @@
     <entity-group group="org.ofbiz" entity="PhysicalInventoryAndVariance" />
     <entity-group group="org.ofbiz" entity="VarianceReason" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.location -->
-  <!-- ========================================================= -->
-
-    <entity-group group="org.ofbiz" entity="ProductFacility" />
-    <entity-group group="org.ofbiz" entity="ProductFacilityLocation" />
-    <entity-group group="org.ofbiz" entity="ProductFacilityLocationView" />
-    <entity-group group="org.ofbiz" entity="ProductFacilityLocationQuantityTest" />
-
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.price -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.price -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ProductPaymentMethodType" />
     <entity-group group="org.ofbiz" entity="ProductPrice" />
@@ -150,12 +167,10 @@
     <entity-group group="org.ofbiz" entity="QuantityBreakType" />
     <entity-group group="org.ofbiz" entity="SaleType" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.product -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.product -->
+    <!-- ========================================================= -->
 
-    <entity-group group="org.ofbiz" entity="CommunicationEventProduct" />
-    <entity-group group="org.ofbiz" entity="CommunicationEventAndProduct" />
     <entity-group group="org.ofbiz" entity="GoodIdentification" />
     <entity-group group="org.ofbiz" entity="GoodIdentificationAndProduct" />
     <entity-group group="org.ofbiz" entity="GoodIdentificationType" />
@@ -187,9 +202,9 @@
     <entity-group group="org.ofbiz" entity="ProductAndPriceView" />
     <entity-group group="org.ofbiz" entity="VendorProduct" />
     
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.promo -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.promo -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ProductPromo" />
     <entity-group group="org.ofbiz" entity="ProductPromoAction" />
@@ -204,31 +219,9 @@
     <entity-group group="org.ofbiz" entity="ProductPromoUse" />
     <entity-group group="org.ofbiz" entity="ProductPromoUseCheck" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.storage -->
-  <!-- ========================================================= -->
-
-    <entity-group group="org.ofbiz" entity="Container" />
-    <entity-group group="org.ofbiz" entity="ContainerType" />
-    <entity-group group="org.ofbiz" entity="Facility" />
-    <entity-group group="org.ofbiz" entity="FacilityAttribute" />
-    <entity-group group="org.ofbiz" entity="FacilityCarrierShipment" />
-    <entity-group group="org.ofbiz" entity="FacilityContactMech" />
-    <entity-group group="org.ofbiz" entity="FacilityContactMechPurpose" />
-    <entity-group group="org.ofbiz" entity="FacilityGroup" />
-    <entity-group group="org.ofbiz" entity="FacilityGroupMember" />
-    <entity-group group="org.ofbiz" entity="FacilityGroupRole" />
-    <entity-group group="org.ofbiz" entity="FacilityGroupRollup" />
-    <entity-group group="org.ofbiz" entity="FacilityGroupType" />
-    <entity-group group="org.ofbiz" entity="FacilityLocation" />
-    <entity-group group="org.ofbiz" entity="FacilityRole" />
-    <entity-group group="org.ofbiz" entity="FacilityType" />
-    <entity-group group="org.ofbiz" entity="FacilityTypeAttr" />
-    <entity-group group="org.ofbiz" entity="FacilityAndContactMech" />
-
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.store -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.store -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ProductStore" />
     <entity-group group="org.ofbiz" entity="ProductStoreCatalog" />
@@ -260,17 +253,16 @@
     <entity-group group="org.ofbiz" entity="Subscription" />
     <entity-group group="org.ofbiz" entity="SubscriptionActivity" />
     <entity-group group="org.ofbiz" entity="SubscriptionAttribute" />
+    <entity-group group="org.ofbiz" entity="SubscriptionCommEvent" />
+    <entity-group group="org.ofbiz" entity="SubscriptionAndCommEvent" />
     <entity-group group="org.ofbiz" entity="SubscriptionFulfillmentPiece" />
     <entity-group group="org.ofbiz" entity="SubscriptionResource" />
     <entity-group group="org.ofbiz" entity="SubscriptionType" />
     <entity-group group="org.ofbiz" entity="SubscriptionTypeAttr" />
     
-    <entity-group group="org.ofbiz" entity="SubscriptionCommEvent" />
-    <entity-group group="org.ofbiz" entity="SubscriptionAndCommEvent" />
-    
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.supplier -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.supplier -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="MarketInterest" />
     <entity-group group="org.ofbiz" entity="ReorderGuideline" />
@@ -279,17 +271,17 @@
     <entity-group group="org.ofbiz" entity="SupplierProductFeature" />
     <entity-group group="org.ofbiz" entity="SupplierRatingType" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.shipment.issuance -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.shipment.issuance -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="ItemIssuance" />
     <entity-group group="org.ofbiz" entity="ItemIssuanceAndInventoryItem" />
     <entity-group group="org.ofbiz" entity="ItemIssuanceRole" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.shipment.picklist -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.shipment.picklist -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="Picklist" />
     <entity-group group="org.ofbiz" entity="PicklistAndBinAndItem" />
@@ -299,18 +291,18 @@
     <entity-group group="org.ofbiz" entity="PicklistRole" />
     <entity-group group="org.ofbiz" entity="PicklistStatusHistory" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.shipment.receipt -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.shipment.receipt -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="RejectionReason" />
     <entity-group group="org.ofbiz" entity="ShipmentReceipt" />
     <entity-group group="org.ofbiz" entity="ShipmentReceiptRole" />
     <entity-group group="org.ofbiz" entity="ShipmentReceiptAndItem" />
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.shipment.shipment -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.shipment.shipment -->
+    <!-- ========================================================= -->
 
     <entity-group group="org.ofbiz" entity="Delivery" />
     <entity-group group="org.ofbiz" entity="CarrierAndShipmentMethod" />
@@ -341,7 +333,3 @@
     <entity-group group="org.ofbiz" entity="ShippingDocument" />
     <entity-group group="org.ofbiz" entity="PackedQtyVsOrderItemQuantity" />
 </entitygroup>
-
-
-
-

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=631868&r1=631867&r2=631868&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Feb 27 22:37:12 2008
@@ -25,7 +25,7 @@
     <!-- ========================================================= -->
     <title>Entity of an Open For Business Project Component</title>
     <description>None</description>
-    <copyright>Copyright 2001-2006 The Apache Software Foundation</copyright>
+    <copyright>Copyright 2001-2008 The Apache Software Foundation</copyright>
     <author>None</author>
     <version>1.0</version>
 
@@ -36,13 +36,12 @@
     <!--  - org.ofbiz.product.category -->
     <!--  - org.ofbiz.product.config -->
     <!--  - org.ofbiz.product.cost -->
+    <!--  - org.ofbiz.product.facility -->
     <!--  - org.ofbiz.product.feature -->
     <!--  - org.ofbiz.product.inventory -->
-    <!--  - org.ofbiz.product.location -->
     <!--  - org.ofbiz.product.price -->
     <!--  - org.ofbiz.product.product -->
     <!--  - org.ofbiz.product.promo -->
-    <!--  - org.ofbiz.product.storage -->
     <!--  - org.ofbiz.product.store -->
     <!--  - org.ofbiz.product.subscription -->
     <!--  - org.ofbiz.product.supplier -->
@@ -828,9 +827,400 @@
       </relation>
     </entity>
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.feature -->
-  <!-- ========================================================= -->
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.facility -->
+    <!-- ========================================================= -->
+
+    <entity entity-name="Container" package-name="org.ofbiz.product.facility" title="Container Entity">
+        <field name="containerId" type="id-ne"></field>
+        <field name="containerTypeId" type="id"></field>
+        <field name="facilityId" type="id"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="containerId"/>
+        <relation type="one" fk-name="CONTAINER_CTTYP" rel-entity-name="ContainerType">
+            <key-map field-name="containerTypeId"/>
+        </relation>
+        <relation type="one" fk-name="CONTAINER_FACILITY" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+    </entity>
+    <entity entity-name="ContainerType" package-name="org.ofbiz.product.facility" title="Container Type Entity">
+        <field name="containerTypeId" type="id-ne"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="containerTypeId"/>
+    </entity>
+    <entity entity-name="Facility" package-name="org.ofbiz.product.facility" title="Facility Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="facilityTypeId" type="id"></field>
+        <field name="ownerPartyId" type="id-ne"/>
+        <field name="defaultInventoryItemTypeId" type="id"></field>
+        <field name="facilityName" type="name"></field>
+        <field name="primaryFacilityGroupId" type="id"></field>
+        <field name="squareFootage" type="numeric"></field>
+        <field name="productStoreId" type="id"></field>
+        <field name="defaultDaysToShip" type="numeric"><description>In the absence of a product specific days to ship in ProductFacility, this will be used</description></field>
+        <field name="openedDate" type="date-time"></field>
+        <field name="closedDate" type="date-time"></field>
+        <field name="description" type="description"></field>
+        <field name="defaultWeightUomId" type="id"></field>
+        <prim-key field="facilityId"/>
+        <relation type="one" fk-name="FACILITY_FCTYP" rel-entity-name="FacilityType">
+            <key-map field-name="facilityTypeId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_PGRP" rel-entity-name="FacilityGroup">
+            <key-map field-name="primaryFacilityGroupId" rel-field-name="facilityGroupId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_OWNER" title="Owner" rel-entity-name="Party">
+            <key-map field-name="ownerPartyId" rel-field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="FAC_INVITM_TYPE" title="Default" rel-entity-name="InventoryItemType">
+            <key-map field-name="defaultInventoryItemTypeId" rel-field-name="inventoryItemTypeId"/>
+        </relation>
+        <relation type="one" fk-name="FAC_DEF_UOM" rel-entity-name="Uom">
+            <key-map field-name="defaultWeightUomId" rel-field-name="uomId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="ProductStore">
+            <description>this was changed from the FK to better handle syncronization; this may be set back to be a FK in the future</description>
+            <key-map field-name="productStoreId"/>
+        </relation>
+        <relation type="many" rel-entity-name="FacilityTypeAttr">
+            <key-map field-name="facilityTypeId"/>
+        </relation>
+    </entity>
+    <view-entity entity-name="FacilityAndContactMech" package-name="org.ofbiz.product.facility" title="Facility and Contact Mech View Entity">
+        <member-entity entity-alias="FA" entity-name="Facility"/>
+        <member-entity entity-alias="CM" entity-name="FacilityContactMech"/>
+        <alias-all entity-alias="FA"/>
+        <alias-all entity-alias="CM"/>
+        <view-link entity-alias="FA" rel-entity-alias="CM">
+            <key-map field-name="facilityId"/>
+        </view-link>
+    </view-entity>
+    <entity entity-name="FacilityAttribute" package-name="org.ofbiz.product.facility" title="Facility Attribute Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="attrName" type="id-long-ne"></field>
+        <field name="attrValue" type="value"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="attrName"/>
+        <relation type="one" fk-name="FACILITY_ATTR" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="many" rel-entity-name="FacilityTypeAttr">
+            <key-map field-name="attrName"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityCarrierShipment" package-name="org.ofbiz.product.facility" title="Facility Role Type Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="partyId" type="id-ne"></field>
+        <field name="roleTypeId" type="id-ne"></field>
+        <field name="shipmentMethodTypeId" type="id-ne"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="partyId"/>
+        <prim-key field="roleTypeId"/>
+        <prim-key field="shipmentMethodTypeId"/>
+        <relation type="one" fk-name="FACILITY_CSH_PTY" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_CSH_FAC" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_CSH_STP" rel-entity-name="ShipmentMethodType">
+            <key-map field-name="shipmentMethodTypeId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_CSH_CSM" rel-entity-name="CarrierShipmentMethod">
+            <key-map field-name="shipmentMethodTypeId"/>
+            <key-map field-name="partyId"/>
+            <key-map field-name="roleTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityContactMech" package-name="org.ofbiz.product.facility" title="Facility Contact Mechanism Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="contactMechId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="extension" type="very-short"></field>
+        <field name="comments" type="comment"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="contactMechId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="FACIL_CMECH_FACIL" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="FACIL_CMECH_CMECH" rel-entity-name="ContactMech">
+            <key-map field-name="contactMechId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="TelecomNumber">
+            <key-map field-name="contactMechId"/>
+        </relation>
+        <relation type="many" rel-entity-name="FacilityContactMechPurpose">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="contactMechId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityContactMechPurpose" package-name="org.ofbiz.product.facility" title="Facility Contact Mechanism Purpose Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="contactMechId" type="id-ne"></field>
+        <field name="contactMechPurposeTypeId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="contactMechId"/>
+        <prim-key field="contactMechPurposeTypeId"/>
+        <prim-key field="fromDate"/>
+        <relation type="many" rel-entity-name="FacilityContactMech">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="contactMechId"/>
+        </relation>
+        <relation type="one" fk-name="FACIL_CMPRP_TYPE" rel-entity-name="ContactMechPurposeType">
+            <key-map field-name="contactMechPurposeTypeId"/>
+        </relation>
+        <relation type="one" fk-name="FACIL_CMPRP_FACIL" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="FACIL_CMPRP_CMECH" rel-entity-name="ContactMech">
+            <key-map field-name="contactMechId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityGroup" package-name="org.ofbiz.product.facility" title="Facility Group Entity">
+        <field name="facilityGroupId" type="id-ne"></field>
+        <field name="facilityGroupTypeId" type="id"></field>
+        <field name="primaryParentGroupId" type="id"></field>
+        <field name="facilityGroupName" type="name"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="facilityGroupId"/>
+        <relation type="one" fk-name="FACILITY_GP_TYPE" rel-entity-name="FacilityGroupType">
+            <key-map field-name="facilityGroupTypeId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_GP_PGRP" title="PrimaryParent" rel-entity-name="FacilityGroup">
+            <key-map field-name="primaryParentGroupId" rel-field-name="facilityGroupId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityGroupMember" package-name="org.ofbiz.product.facility" title="Facility Group Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="facilityGroupId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="sequenceNum" type="numeric"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="facilityGroupId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="FACILITY_MEM_FAC" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_MEM_FGRP" rel-entity-name="FacilityGroup">
+            <key-map field-name="facilityGroupId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityGroupRole" package-name="org.ofbiz.product.facility" title="Facility Group Role Entity">
+        <field name="facilityGroupId" type="id-ne"></field>
+        <field name="partyId" type="id"></field>
+        <field name="roleTypeId" type="id"></field>
+        <prim-key field="facilityGroupId"/>
+        <prim-key field="partyId"/>
+        <prim-key field="roleTypeId"/>
+        <relation type="one" fk-name="FGROUP_RLE_FGRP" rel-entity-name="FacilityGroup">
+            <key-map field-name="facilityGroupId"/>
+        </relation>
+        <relation type="one" fk-name="FGROUP_RLE_PTRLE" rel-entity-name="PartyRole">
+            <key-map field-name="partyId"/>
+            <key-map field-name="roleTypeId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="RoleType">
+            <key-map field-name="roleTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityGroupRollup" package-name="org.ofbiz.product.facility" title="Facility Group Rollup Entity">
+        <field name="facilityGroupId" type="id-ne"></field>
+        <field name="parentFacilityGroupId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="sequenceNum" type="numeric"></field>
+        <prim-key field="facilityGroupId"/>
+        <prim-key field="parentFacilityGroupId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="FGRP_FRLP_CURRENT" title="Current" rel-entity-name="FacilityGroup">
+            <key-map field-name="facilityGroupId"/>
+        </relation>
+        <relation type="one" fk-name="FGRP_FRLP_PARENT" title="Parent" rel-entity-name="FacilityGroup">
+            <key-map field-name="parentFacilityGroupId" rel-field-name="facilityGroupId"/>
+        </relation>
+        <relation type="many" title="Child" rel-entity-name="FacilityGroupRollup">
+            <key-map field-name="facilityGroupId" rel-field-name="parentFacilityGroupId"/>
+        </relation>
+        <relation type="many" title="Parent" rel-entity-name="FacilityGroupRollup">
+            <key-map field-name="parentFacilityGroupId" rel-field-name="facilityGroupId"/>
+        </relation>
+        <relation type="many" title="Sibling" rel-entity-name="FacilityGroupRollup">
+            <key-map field-name="parentFacilityGroupId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityGroupType" package-name="org.ofbiz.product.facility" title="Facility Group Type Entity"
+        default-resource-name="ProductEntityLabels">
+        <field name="facilityGroupTypeId" type="id-ne"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="facilityGroupTypeId"/>
+    </entity>
+    <entity entity-name="FacilityLocation" package-name="org.ofbiz.product.facility" title="Facility Location Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="locationSeqId" type="id-ne"></field>
+        <field name="locationTypeEnumId" type="id-ne"></field>
+        <field name="areaId" type="id"></field>
+        <field name="aisleId" type="id"></field>
+        <field name="sectionId" type="id"></field>
+        <field name="levelId" type="id"></field>
+        <field name="positionId" type="id"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="locationSeqId"/>
+        <relation type="one" fk-name="FACILITY_LOC_FAC" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_LOC_TENM" title="Type" rel-entity-name="Enumeration">
+            <key-map field-name="locationTypeEnumId" rel-field-name="enumId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityRole" package-name="org.ofbiz.product.facility" title="Facility Role Entity">
+        <field name="facilityId" type="id-ne"></field>
+        <field name="partyId" type="id"></field>
+        <field name="roleTypeId" type="id"></field>
+        <prim-key field="facilityId"/>
+        <prim-key field="partyId"/>
+        <prim-key field="roleTypeId"/>
+        <relation type="one" fk-name="FACILITY_RLE_FAC" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_RLE_PRTY" rel-entity-name="Party">
+            <key-map field-name="partyId"/>
+        </relation>
+        <relation type="one" fk-name="FACILITY_RLE_ROLE" rel-entity-name="RoleType">
+            <key-map field-name="roleTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityType" package-name="org.ofbiz.product.facility" default-resource-name="ProductEntityLabels"
+        title="Facility Type Entity">
+        <field name="facilityTypeId" type="id-ne"></field>
+        <field name="parentTypeId" type="id-ne"></field>
+        <field name="hasTable" type="indicator"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="facilityTypeId"/>
+        <relation type="one" fk-name="FACILITY_TYPEPAR" title="Parent" rel-entity-name="FacilityType">
+            <key-map field-name="parentTypeId" rel-field-name="facilityTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="FacilityTypeAttr" package-name="org.ofbiz.product.facility" title="Facility Type Attribute Entity">
+        <field name="facilityTypeId" type="id-ne"></field>
+        <field name="attrName" type="id-long-ne"></field>
+        <prim-key field="facilityTypeId"/>
+        <prim-key field="attrName"/>
+        <relation type="one" fk-name="FACILITY_TPAT_FT" rel-entity-name="FacilityType">
+            <key-map field-name="facilityTypeId"/>
+        </relation>
+        <relation type="many" rel-entity-name="FacilityAttribute">
+            <key-map field-name="attrName"/>
+        </relation>
+        <relation type="many" rel-entity-name="Facility">
+            <key-map field-name="facilityTypeId"/>
+        </relation>
+    </entity>
+    <entity entity-name="ProductFacility" package-name="org.ofbiz.product.facility" title="Product Facility Entity">
+        <field name="productId" type="id-ne"></field>
+        <field name="facilityId" type="id-ne"></field>
+        <field name="minimumStock" type="floating-point"></field>
+        <field name="reorderQuantity" type="floating-point"></field>
+        <field name="daysToShip" type="numeric"></field>
+        <prim-key field="productId"/>
+        <prim-key field="facilityId"/>
+        <relation type="one" fk-name="PROD_FAC_PROD" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one" fk-name="PROD_FAC_FAC" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+    </entity>
+    <entity entity-name="ProductFacilityLocation" package-name="org.ofbiz.product.facility" title="Product Facility Entity">
+        <field name="productId" type="id-ne"></field>
+        <field name="facilityId" type="id-ne"></field>
+        <field name="locationSeqId" type="id-ne"></field>
+        <field name="minimumStock" type="floating-point"></field>
+        <field name="moveQuantity" type="floating-point"></field>
+        <prim-key field="productId"/>
+        <prim-key field="facilityId"/>
+        <prim-key field="locationSeqId"/>
+        <relation type="one" fk-name="PROD_FCL_PROD" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="Facility">
+            <key-map field-name="facilityId"/>
+        </relation>
+        <relation type="one" fk-name="PROD_FCL_FCL" rel-entity-name="FacilityLocation">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </relation>
+    </entity>
+    <view-entity entity-name="ProductFacilityLocationQuantityTest" package-name="org.ofbiz.product.facility" title="ProductFacilityLocation Quantity Test View Entity">
+        <member-entity entity-alias="PFL" entity-name="ProductFacilityLocation"/>
+        <member-entity entity-alias="FL" entity-name="FacilityLocation"/>
+        <member-entity entity-alias="II" entity-name="InventoryItem"/>
+        <alias entity-alias="PFL" name="productId" group-by="true"/>
+        <alias entity-alias="PFL" name="facilityId" group-by="true"/>
+        <alias entity-alias="PFL" name="locationSeqId" group-by="true"/>
+        <alias entity-alias="PFL" name="minimumStock" group-by="true"/>
+        <alias entity-alias="PFL" name="moveQuantity" group-by="true"/>
+        <alias entity-alias="FL" name="locationTypeEnumId" group-by="true"/>
+        <alias entity-alias="II" name="availableToPromiseTotal" function="sum"/>
+        <alias entity-alias="II" name="quantityOnHandTotal" function="sum"/>
+        <view-link entity-alias="PFL" rel-entity-alias="FL">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </view-link>
+        <view-link entity-alias="PFL" rel-entity-alias="II">
+            <key-map field-name="productId"/>
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </view-link>
+        <relation type="one-nofk" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="FacilityLocation">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="ProductFacilityLocation">
+            <key-map field-name="productId"/>
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </relation>
+    </view-entity>
+    <view-entity entity-name="ProductFacilityLocationView" package-name="org.ofbiz.product.facility" title="ProductFacilityLocation And FacilityLocation View Entity">
+        <member-entity entity-alias="PFL" entity-name="ProductFacilityLocation"/>
+        <member-entity entity-alias="FL" entity-name="FacilityLocation"/>
+        <alias-all entity-alias="PFL"/>
+        <alias-all entity-alias="FL"/>
+        <view-link entity-alias="PFL" rel-entity-alias="FL">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </view-link>
+        <relation type="one-nofk" rel-entity-name="FacilityLocation">
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </relation>
+        <relation type="one-nofk" rel-entity-name="ProductFacilityLocation">
+            <key-map field-name="productId"/>
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </relation>
+        <relation type="many" rel-entity-name="InventoryItem">
+            <key-map field-name="productId"/>
+            <key-map field-name="facilityId"/>
+            <key-map field-name="locationSeqId"/>
+        </relation>
+    </view-entity>
+    
+    <!-- ========================================================= -->
+    <!-- org.ofbiz.product.feature -->
+    <!-- ========================================================= -->
 
     <entity entity-name="ProductFeature"
             package-name="org.ofbiz.product.feature"
@@ -1604,112 +1994,6 @@
     </entity>
 
   <!-- ========================================================= -->
-  <!-- org.ofbiz.product.location -->
-  <!-- ========================================================= -->
-
-    <entity entity-name="ProductFacility"
-            package-name="org.ofbiz.product.location"
-            title="Product Facility Entity">
-      <field name="productId" type="id-ne"></field>
-      <field name="facilityId" type="id-ne"></field>
-      <field name="minimumStock" type="floating-point"></field>
-      <field name="reorderQuantity" type="floating-point"></field>
-      <field name="daysToShip" type="numeric"></field>
-      <prim-key field="productId"/>
-      <prim-key field="facilityId"/>
-      <relation type="one" fk-name="PROD_FAC_PROD" rel-entity-name="Product">
-        <key-map field-name="productId"/>
-      </relation>
-      <relation type="one" fk-name="PROD_FAC_FAC" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-    </entity>
-    <entity entity-name="ProductFacilityLocation"
-            package-name="org.ofbiz.product.location"
-            title="Product Facility Entity">
-      <field name="productId" type="id-ne"></field>
-      <field name="facilityId" type="id-ne"></field>
-      <field name="locationSeqId" type="id-ne"></field>
-      <field name="minimumStock" type="floating-point"></field>
-      <field name="moveQuantity" type="floating-point"></field>
-      <prim-key field="productId"/>
-      <prim-key field="facilityId"/>
-      <prim-key field="locationSeqId"/>
-      <relation type="one" fk-name="PROD_FCL_PROD" rel-entity-name="Product">
-        <key-map field-name="productId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="PROD_FCL_FCL" rel-entity-name="FacilityLocation">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </relation>
-    </entity>
-    <view-entity entity-name="ProductFacilityLocationQuantityTest"
-            package-name="org.ofbiz.product.location"
-            title="ProductFacilityLocation Quantity Test View Entity">
-      <member-entity entity-alias="PFL" entity-name="ProductFacilityLocation"/>
-      <member-entity entity-alias="FL" entity-name="FacilityLocation"/>
-      <member-entity entity-alias="II" entity-name="InventoryItem"/>
-      <alias entity-alias="PFL" name="productId" group-by="true"/>
-      <alias entity-alias="PFL" name="facilityId" group-by="true"/>
-      <alias entity-alias="PFL" name="locationSeqId" group-by="true"/>
-      <alias entity-alias="PFL" name="minimumStock" group-by="true"/>
-      <alias entity-alias="PFL" name="moveQuantity" group-by="true"/>
-      <alias entity-alias="FL" name="locationTypeEnumId" group-by="true"/>
-      <alias entity-alias="II" name="availableToPromiseTotal" function="sum"/>
-      <alias entity-alias="II" name="quantityOnHandTotal" function="sum"/>
-      <view-link entity-alias="PFL" rel-entity-alias="FL">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </view-link>
-      <view-link entity-alias="PFL" rel-entity-alias="II">
-        <key-map field-name="productId"/>
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </view-link>
-      <relation type="one-nofk" rel-entity-name="Product">
-        <key-map field-name="productId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="FacilityLocation">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="ProductFacilityLocation">
-        <key-map field-name="productId"/>
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </relation>
-    </view-entity>
-    <view-entity entity-name="ProductFacilityLocationView"
-            package-name="org.ofbiz.product.location"
-            title="ProductFacilityLocation And FacilityLocation View Entity">
-      <member-entity entity-alias="PFL" entity-name="ProductFacilityLocation"/>
-      <member-entity entity-alias="FL" entity-name="FacilityLocation"/>
-      <alias-all entity-alias="PFL"/>
-      <alias-all entity-alias="FL"/>
-      <view-link entity-alias="PFL" rel-entity-alias="FL">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </view-link>
-      <relation type="one-nofk" rel-entity-name="FacilityLocation">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="ProductFacilityLocation">
-        <key-map field-name="productId"/>
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </relation>
-      <relation type="many" rel-entity-name="InventoryItem">
-        <key-map field-name="productId"/>
-        <key-map field-name="facilityId"/>
-        <key-map field-name="locationSeqId"/>
-      </relation>
-    </view-entity>
-
-  <!-- ========================================================= -->
   <!-- org.ofbiz.product.price -->
   <!-- ========================================================= -->
 
@@ -1935,32 +2219,6 @@
   <!-- org.ofbiz.product.product -->
   <!-- ========================================================= -->
 
-    <entity entity-name="CommunicationEventProduct"
-            package-name="org.ofbiz.product.product"
-            title="Communication Event Product Entity">
-      <field name="productId" type="id-ne"></field>
-      <field name="communicationEventId" type="id-ne"></field>
-      <prim-key field="productId"/>
-      <prim-key field="communicationEventId"/>
-      <relation type="one" fk-name="COMEV_PROD_PROD" rel-entity-name="Product">
-        <key-map field-name="productId"/>
-      </relation>
-      <relation type="one" fk-name="COMEV_PROD_CMEV" rel-entity-name="CommunicationEvent">
-        <key-map field-name="communicationEventId"/>
-      </relation>
-    </entity>
-    <view-entity entity-name="CommunicationEventAndProduct"
-                 package-name="org.ofbiz.product.communication"
-                 title="Communication Event And Product View Entity">
-      <member-entity entity-alias="CP" entity-name="CommunicationEventProduct"/>
-      <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>
-      <alias-all entity-alias="CP"/>
-      <alias-all entity-alias="CE"/>
-      <view-link entity-alias="CP" rel-entity-alias="CE">
-        <key-map field-name="communicationEventId"/>
-      </view-link>
-    </view-entity>
-
     <entity entity-name="GoodIdentification"
             package-name="org.ofbiz.product.product"
             title="Good Identification Entity">
@@ -3021,336 +3279,6 @@
           <key-map field-name="orderId"/>
       </view-link>
     </view-entity>
-
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.product.storage -->
-  <!-- ========================================================= -->
-
-    <entity entity-name="Container"
-            package-name="org.ofbiz.product.storage"
-            title="Container Entity">
-      <field name="containerId" type="id-ne"></field>
-      <field name="containerTypeId" type="id"></field>
-      <field name="facilityId" type="id"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="containerId"/>
-      <relation type="one" fk-name="CONTAINER_CTTYP" rel-entity-name="ContainerType">
-        <key-map field-name="containerTypeId"/>
-      </relation>
-      <relation type="one" fk-name="CONTAINER_FACILITY" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-    </entity>
-    <entity entity-name="ContainerType"
-            package-name="org.ofbiz.product.storage"
-            title="Container Type Entity">
-      <field name="containerTypeId" type="id-ne"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="containerTypeId"/>
-    </entity>
-    <entity entity-name="Facility"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="facilityTypeId" type="id"></field>
-      <field name="ownerPartyId" type="id-ne"/>
-      <field name="defaultInventoryItemTypeId" type="id"></field>
-      <field name="facilityName" type="name"></field>
-      <field name="primaryFacilityGroupId" type="id"></field>
-      <field name="squareFootage" type="numeric"></field>
-      <field name="productStoreId" type="id"></field>
-      <field name="defaultDaysToShip" type="numeric"><description>In the absence of a product specific days to ship in ProductFacility, this will be used</description></field>
-      <field name="openedDate" type="date-time"></field>
-      <field name="closedDate" type="date-time"></field>
-      <field name="description" type="description"></field>
-      <field name="defaultWeightUomId" type="id"></field>
-      <prim-key field="facilityId"/>
-      <relation type="one" fk-name="FACILITY_FCTYP" rel-entity-name="FacilityType">
-        <key-map field-name="facilityTypeId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_PGRP" rel-entity-name="FacilityGroup">
-        <key-map field-name="primaryFacilityGroupId" rel-field-name="facilityGroupId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_OWNER" title="Owner" rel-entity-name="Party">
-        <key-map field-name="ownerPartyId" rel-field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="FAC_INVITM_TYPE" title="Default" rel-entity-name="InventoryItemType">
-        <key-map field-name="defaultInventoryItemTypeId" rel-field-name="inventoryItemTypeId"/>
-      </relation>
-      <relation type="one" fk-name="FAC_DEF_UOM" rel-entity-name="Uom">
-        <key-map field-name="defaultWeightUomId" rel-field-name="uomId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="ProductStore">
-        <description>this was changed from the FK to better handle syncronization; this may be set back to be a FK in the future</description>
-        <key-map field-name="productStoreId"/>
-      </relation>
-      <relation type="many" rel-entity-name="FacilityTypeAttr">
-        <key-map field-name="facilityTypeId"/>
-      </relation>
-    </entity>
-    <view-entity entity-name="FacilityAndContactMech" package-name="org.ofbiz.product.storage" title="Facility and Contact Mech View Entity">
-        <member-entity entity-alias="FA" entity-name="Facility"/>
-        <member-entity entity-alias="CM" entity-name="FacilityContactMech"/>
-        <alias-all entity-alias="FA"/>
-        <alias-all entity-alias="CM"/>
-        <view-link entity-alias="FA" rel-entity-alias="CM">
-            <key-map field-name="facilityId"/>
-        </view-link>
-    </view-entity>
-    <entity entity-name="FacilityAttribute"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Attribute Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
-      <field name="attrValue" type="value"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="attrName"/>
-      <relation type="one" fk-name="FACILITY_ATTR" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="many" rel-entity-name="FacilityTypeAttr">
-        <key-map field-name="attrName"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityCarrierShipment"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Role Type Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="partyId" type="id-ne"></field>
-      <field name="roleTypeId" type="id-ne"></field>
-      <field name="shipmentMethodTypeId" type="id-ne"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="partyId"/>
-      <prim-key field="roleTypeId"/>
-      <prim-key field="shipmentMethodTypeId"/>
-      <relation type="one" fk-name="FACILITY_CSH_PTY" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_CSH_FAC" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_CSH_STP" rel-entity-name="ShipmentMethodType">
-        <key-map field-name="shipmentMethodTypeId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_CSH_CSM" rel-entity-name="CarrierShipmentMethod">
-        <key-map field-name="shipmentMethodTypeId"/>
-        <key-map field-name="partyId"/>
-        <key-map field-name="roleTypeId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityContactMech"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Contact Mechanism Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="contactMechId" type="id-ne"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <field name="extension" type="very-short"></field>
-      <field name="comments" type="comment"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="contactMechId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="FACIL_CMECH_FACIL" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="FACIL_CMECH_CMECH" rel-entity-name="ContactMech">
-        <key-map field-name="contactMechId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="TelecomNumber">
-        <key-map field-name="contactMechId"/>
-      </relation>
-      <relation type="many" rel-entity-name="FacilityContactMechPurpose">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="contactMechId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityContactMechPurpose"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Contact Mechanism Purpose Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="contactMechId" type="id-ne"></field>
-      <field name="contactMechPurposeTypeId" type="id-ne"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="contactMechId"/>
-      <prim-key field="contactMechPurposeTypeId"/>
-      <prim-key field="fromDate"/>
-      <relation type="many" rel-entity-name="FacilityContactMech">
-        <key-map field-name="facilityId"/>
-        <key-map field-name="contactMechId"/>
-      </relation>
-      <relation type="one" fk-name="FACIL_CMPRP_TYPE" rel-entity-name="ContactMechPurposeType">
-        <key-map field-name="contactMechPurposeTypeId"/>
-      </relation>
-      <relation type="one" fk-name="FACIL_CMPRP_FACIL" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="FACIL_CMPRP_CMECH" rel-entity-name="ContactMech">
-        <key-map field-name="contactMechId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityGroup"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Group Entity">
-      <field name="facilityGroupId" type="id-ne"></field>
-      <field name="facilityGroupTypeId" type="id"></field>
-      <field name="primaryParentGroupId" type="id"></field>
-      <field name="facilityGroupName" type="name"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="facilityGroupId"/>
-      <relation type="one" fk-name="FACILITY_GP_TYPE" rel-entity-name="FacilityGroupType">
-        <key-map field-name="facilityGroupTypeId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_GP_PGRP" title="PrimaryParent" rel-entity-name="FacilityGroup">
-        <key-map field-name="primaryParentGroupId" rel-field-name="facilityGroupId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityGroupMember"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Group Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="facilityGroupId" type="id-ne"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <field name="sequenceNum" type="numeric"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="facilityGroupId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="FACILITY_MEM_FAC" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_MEM_FGRP" rel-entity-name="FacilityGroup">
-        <key-map field-name="facilityGroupId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityGroupRole"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Group Role Entity">
-      <field name="facilityGroupId" type="id-ne"></field>
-      <field name="partyId" type="id"></field>
-      <field name="roleTypeId" type="id"></field>
-      <prim-key field="facilityGroupId"/>
-      <prim-key field="partyId"/>
-      <prim-key field="roleTypeId"/>
-      <relation type="one" fk-name="FGROUP_RLE_FGRP" rel-entity-name="FacilityGroup">
-        <key-map field-name="facilityGroupId"/>
-      </relation>
-      <relation type="one" fk-name="FGROUP_RLE_PTRLE" rel-entity-name="PartyRole">
-        <key-map field-name="partyId"/>
-        <key-map field-name="roleTypeId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one-nofk" rel-entity-name="RoleType">
-        <key-map field-name="roleTypeId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityGroupRollup"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Group Rollup Entity">
-      <field name="facilityGroupId" type="id-ne"></field>
-      <field name="parentFacilityGroupId" type="id-ne"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <field name="sequenceNum" type="numeric"></field>
-      <prim-key field="facilityGroupId"/>
-      <prim-key field="parentFacilityGroupId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="FGRP_FRLP_CURRENT" title="Current" rel-entity-name="FacilityGroup">
-        <key-map field-name="facilityGroupId"/>
-      </relation>
-      <relation type="one" fk-name="FGRP_FRLP_PARENT" title="Parent" rel-entity-name="FacilityGroup">
-        <key-map field-name="parentFacilityGroupId" rel-field-name="facilityGroupId"/>
-      </relation>
-      <relation type="many" title="Child" rel-entity-name="FacilityGroupRollup">
-        <key-map field-name="facilityGroupId" rel-field-name="parentFacilityGroupId"/>
-      </relation>
-      <relation type="many" title="Parent" rel-entity-name="FacilityGroupRollup">
-        <key-map field-name="parentFacilityGroupId" rel-field-name="facilityGroupId"/>
-      </relation>
-      <relation type="many" title="Sibling" rel-entity-name="FacilityGroupRollup">
-        <key-map field-name="parentFacilityGroupId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityGroupType"
-            package-name="org.ofbiz.product.storage"
-            default-resource-name="ProductEntityLabels"
-            title="Facility Group Type Entity">
-      <field name="facilityGroupTypeId" type="id-ne"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="facilityGroupTypeId"/>
-    </entity>
-    <entity entity-name="FacilityLocation"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Location Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="locationSeqId" type="id-ne"></field>
-      <field name="locationTypeEnumId" type="id-ne"></field>
-      <field name="areaId" type="id"></field>
-      <field name="aisleId" type="id"></field>
-      <field name="sectionId" type="id"></field>
-      <field name="levelId" type="id"></field>
-      <field name="positionId" type="id"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="locationSeqId"/>
-      <relation type="one" fk-name="FACILITY_LOC_FAC" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_LOC_TENM" title="Type" rel-entity-name="Enumeration">
-        <key-map field-name="locationTypeEnumId" rel-field-name="enumId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityRole"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Role Entity">
-      <field name="facilityId" type="id-ne"></field>
-      <field name="partyId" type="id"></field>
-      <field name="roleTypeId" type="id"></field>
-      <prim-key field="facilityId"/>
-      <prim-key field="partyId"/>
-      <prim-key field="roleTypeId"/>
-      <relation type="one" fk-name="FACILITY_RLE_FAC" rel-entity-name="Facility">
-        <key-map field-name="facilityId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_RLE_PRTY" rel-entity-name="Party">
-        <key-map field-name="partyId"/>
-      </relation>
-      <relation type="one" fk-name="FACILITY_RLE_ROLE" rel-entity-name="RoleType">
-        <key-map field-name="roleTypeId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityType"
-            package-name="org.ofbiz.product.storage"
-            default-resource-name="ProductEntityLabels"
-            title="Facility Type Entity">
-      <field name="facilityTypeId" type="id-ne"></field>
-      <field name="parentTypeId" type="id-ne"></field>
-      <field name="hasTable" type="indicator"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="facilityTypeId"/>
-      <relation type="one" fk-name="FACILITY_TYPEPAR" title="Parent" rel-entity-name="FacilityType">
-        <key-map field-name="parentTypeId" rel-field-name="facilityTypeId"/>
-      </relation>
-    </entity>
-    <entity entity-name="FacilityTypeAttr"
-            package-name="org.ofbiz.product.storage"
-            title="Facility Type Attribute Entity">
-      <field name="facilityTypeId" type="id-ne"></field>
-      <field name="attrName" type="id-long-ne"></field>
-      <prim-key field="facilityTypeId"/>
-      <prim-key field="attrName"/>
-      <relation type="one" fk-name="FACILITY_TPAT_FT" rel-entity-name="FacilityType">
-        <key-map field-name="facilityTypeId"/>
-      </relation>
-      <relation type="many" rel-entity-name="FacilityAttribute">
-        <key-map field-name="attrName"/>
-      </relation>
-      <relation type="many" rel-entity-name="Facility">
-        <key-map field-name="facilityTypeId"/>
-      </relation>
-    </entity>
 
   <!-- ========================================================= -->
   <!-- org.ofbiz.product.store -->