[OFBiz] SVN: r7090 - in trunk/applications: order/entitydef product/entitydef

[byersa@svn.ofbiz.org]

Author: byersa
Date: 2006-03-27 11:57:28 -0600 (Mon, 27 Mar 2006)
New Revision: 7090

Modified:
   trunk/applications/order/entitydef/entitygroup.xml
   trunk/applications/order/entitydef/entitymodel.xml
   trunk/applications/product/entitydef/entitygroup.xml
   trunk/applications/product/entitydef/entitymodel.xml
Log:
Decided to commit CommunicationEventOrder and CommunicationEventProduct. 
We have so many entities, I just hated to implement these in a custom webapp only to have others need them.
There will be services to use them.


Modified: trunk/applications/order/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/order/entitydef/entitygroup.xml	2006-03-27 17:49:09 UTC (rev 7089)
+++ trunk/applications/order/entitydef/entitygroup.xml	2006-03-27 17:57:28 UTC (rev 7090)
@@ -28,7 +28,10 @@
     <!-- org.ofbiz.order.order -->
     <!-- ========================================================= -->
 
-    <entity-group group="org.ofbiz" entity="OldOrderItemInventoryRes" />
+	
+    <entity-group group="org.ofbiz" entity="CommunicationEventOrder" />
+
+	<entity-group group="org.ofbiz" entity="OldOrderItemInventoryRes" />
     <entity-group group="org.ofbiz" entity="OldOrderShipmentPreference" />
     <entity-group group="org.ofbiz" entity="OrderAdjustment" />
     <entity-group group="org.ofbiz" entity="OrderAdjustmentAttribute" />

Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml	2006-03-27 17:49:09 UTC (rev 7089)
+++ trunk/applications/order/entitydef/entitymodel.xml	2006-03-27 17:57:28 UTC (rev 7090)
@@ -231,6 +231,20 @@
       <field name="description" type="description"></field>
       <prim-key field="orderBlacklistTypeId"/>
     </entity>
+ 	<entity entity-name="CommunicationEventOrder"
+            package-name="org.ofbiz.order.order"
+            title="Communication Event Order Entity">
+      <field name="orderId" type="id-ne"></field>
+      <field name="communicationEventId" type="id-ne"></field>
+      <prim-key field="orderId"/>
+      <prim-key field="communicationEventId"/>
+      <relation type="one" fk-name="COMEV_ORDER_ORDER" rel-entity-name="OrderHeader">
+        <key-map field-name="orderId"/>
+      </relation>
+      <relation type="one" fk-name="COMEV_ORDER_CMEV" rel-entity-name="CommunicationEvent">
+        <key-map field-name="communicationEventId"/>
+      </relation>
+    </entity>
     <entity entity-name="OrderContactMech"
             package-name="org.ofbiz.order.order"
             never-cache="true"

Modified: trunk/applications/product/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/product/entitydef/entitygroup.xml	2006-03-27 17:49:09 UTC (rev 7089)
+++ trunk/applications/product/entitydef/entitygroup.xml	2006-03-27 17:57:28 UTC (rev 7090)
@@ -145,6 +145,7 @@
   <!-- org.ofbiz.product.product -->
   <!-- ========================================================= -->
 
+    <entity-group group="org.ofbiz" entity="CommunicationEventProduct" />
     <entity-group group="org.ofbiz" entity="GoodIdentification" />
     <entity-group group="org.ofbiz" entity="GoodIdentificationAndProduct" />
     <entity-group group="org.ofbiz" entity="GoodIdentificationType" />

Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml	2006-03-27 17:49:09 UTC (rev 7089)
+++ trunk/applications/product/entitydef/entitymodel.xml	2006-03-27 17:57:28 UTC (rev 7090)
@@ -1646,6 +1646,22 @@
   <!-- 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>
+	
+	
     <entity entity-name="GoodIdentification"
             package-name="org.ofbiz.product.product"
             title="Good Identification Entity">