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

[jonesde]

Author: jonesde
Date: Mon Feb 25 17:51:20 2008
New Revision: 631065

URL: http://svn.apache.org/viewvc?rev=631065&view=rev
Log:
Moved CommEventContent entities to be with CommEvent instead of Content because Content is lower level and CommEvent stuff there doesn'ower level and comm event stuff there doesn't make any sense

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

Modified: ofbiz/trunk/applications/content/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitygroup.xml?rev=631065&r1=631064&r2=631065&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitygroup.xml Mon Feb 25 17:51:20 2008
@@ -22,14 +22,6 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitygroup.xsd">
 
   <!-- ========================================================= -->
-  <!-- org.ofbiz.content.commevent -->
-  <!-- ========================================================= -->
-
-    <entity-group group="org.ofbiz" entity="CommEventContentAssoc" />
-    <entity-group group="org.ofbiz" entity="CommContentAssocType" />
-    <entity-group group="org.ofbiz" entity="CommEventContentDataResource" />
-
-  <!-- ========================================================= -->
   <!-- org.ofbiz.content.compdoc -->
   <!-- ========================================================= -->
 

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=631065&r1=631064&r2=631065&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Mon Feb 25 17:51:20 2008
@@ -32,7 +32,6 @@
   <!-- ========================================================= -->
   <!-- ======================== Data Model ===================== -->
   <!-- The modules in this file are as follows:                  -->
-  <!--  - org.ofbiz.content.commevent -->
   <!--  - org.ofbiz.content.compdoc -->
   <!--  - org.ofbiz.content.content -->
   <!--  - org.ofbiz.content.data -->
@@ -43,40 +42,6 @@
   <!-- ========================================================= -->
 
   <!-- ========================================================= -->
-  <!-- org.ofbiz.content.commevent -->
-  <!-- ========================================================= -->
-
-   <entity entity-name="CommEventContentAssoc"
-            package-name="org.ofbiz.content.commevent"
-            title="CommunicationEvent Content Association Entity">
-      <field name="contentId" type="id-ne"></field>
-      <field name="communicationEventId" type="id-ne"></field>
-      <field name="commContentAssocTypeId" type="id"></field>
-      <field name="fromDate" type="date-time"></field>
-      <field name="thruDate" type="date-time"></field>
-      <field name="sequenceNum" type="numeric"></field>
-      <prim-key field="contentId"/>
-      <prim-key field="communicationEventId"/>
-      <prim-key field="fromDate"/>
-      <relation type="one" fk-name="COMMEV_CA_FROM" title="From" rel-entity-name="Content">
-        <key-map field-name="contentId"/>
-      </relation>
-      <relation type="one" fk-name="COMMEV_CA_COMMEV"  rel-entity-name="CommunicationEvent">
-        <key-map field-name="communicationEventId"/>
-      </relation>
-      <relation type="one" fk-name="COMMEV_CA_TYP" rel-entity-name="CommContentAssocType">
-        <key-map field-name="commContentAssocTypeId"/>
-      </relation>
-    </entity>
-    <entity entity-name="CommContentAssocType"
-            package-name="org.ofbiz.content.commevent"
-            title="CommunicationEvent Content Association Type Entity">
-      <field name="commContentAssocTypeId" type="id-ne"></field>
-      <field name="description" type="description"></field>
-      <prim-key field="commContentAssocTypeId"/>
-    </entity>
-
-    <!-- ========================================================= -->
   <!-- org.ofbiz.content.compdoc -->
   <!-- ========================================================= -->
 
@@ -514,52 +479,6 @@
       </view-link>
       <relation type="one-nofk" rel-entity-name="ElectronicText">
         <key-map field-name="dataResourceId" />
-      </relation>
-      <relation type="one-nofk" rel-entity-name="ImageDataResource">
-        <key-map field-name="dataResourceId" />
-      </relation>
-      <relation type="one-nofk" rel-entity-name="OtherDataResource">
-        <key-map field-name="dataResourceId" />
-      </relation>
-      <relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
-        <key-map field-name="contentId" rel-field-name="contentIdStart" />
-      </relation>
-      <relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
-        <key-map field-name="contentId" rel-field-name="contentIdStart" />
-      </relation>
-      <relation type="many" title="From" rel-entity-name="ContentAssoc">
-        <key-map field-name="contentId"/>
-      </relation>
-      <relation type="many" title="To" rel-entity-name="ContentAssoc">
-        <key-map field-name="contentId" rel-field-name="contentIdTo"/>
-      </relation>
-      <relation type="many" rel-entity-name="ContentPurpose">
-          <key-map field-name="contentId"/>
-      </relation>
-      <relation type="many" rel-entity-name="ContentRole">
-        <key-map field-name="contentId"/>
-      </relation>
-    </view-entity>
-    <view-entity entity-name="CommEventContentDataResource"
-                package-name="org.ofbiz.content.content"
-                title="CommEvent and Content and DataResource View Entity">
-      <member-entity entity-alias="CECA" entity-name="CommEventContentAssoc"/>
-      <member-entity entity-alias="CO" entity-name="Content"/>
-      <member-entity entity-alias="DR" entity-name="DataResource"/>
-      <alias-all entity-alias="CECA" />
-      <alias-all entity-alias="CO" />
-      <alias-all entity-alias="DR" prefix="dr"/>
-      <view-link entity-alias="CECA" rel-entity-alias="CO" rel-optional="false">
-        <key-map field-name="contentId"/>
-      </view-link>
-      <view-link entity-alias="CO" rel-entity-alias="DR" rel-optional="true">
-        <key-map field-name="dataResourceId"/>
-      </view-link>
-      <relation type="one-nofk" rel-entity-name="ElectronicText">
-        <key-map field-name="dataResourceId" />
-      </relation>
-      <relation type="one-nofk" rel-entity-name="CommunicationEvent">
-        <key-map field-name="communicationEventId" />
       </relation>
       <relation type="one-nofk" rel-entity-name="ImageDataResource">
         <key-map field-name="dataResourceId" />

Modified: ofbiz/trunk/applications/party/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitygroup.xml?rev=631065&r1=631064&r2=631065&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitygroup.xml Mon Feb 25 17:51:20 2008
@@ -52,6 +52,9 @@
   <!-- org.ofbiz.party.communication -->
   <!-- ========================================================= -->
 
+    <entity-group group="org.ofbiz" entity="CommEventContentAssoc" />
+    <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="CommunicationEventPrpTyp" />
     <entity-group group="org.ofbiz" entity="CommunicationEventPurpose" />

Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=631065&r1=631064&r2=631065&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Mon Feb 25 17:51:20 2008
@@ -490,9 +490,76 @@
   <!-- org.ofbiz.party.communication -->
   <!-- ========================================================= -->
 
-    <entity entity-name="CommunicationEvent"
-            package-name="org.ofbiz.party.communication"
-            title="Communication Event Entity">
+    <entity entity-name="CommContentAssocType" package-name="org.ofbiz.party.communication" title="CommunicationEvent Content Association Type Entity">
+        <field name="commContentAssocTypeId" type="id-ne"></field>
+        <field name="description" type="description"></field>
+        <prim-key field="commContentAssocTypeId"/>
+    </entity>
+    <entity entity-name="CommEventContentAssoc" package-name="org.ofbiz.party.communication" title="CommunicationEvent Content Association Entity">
+        <field name="contentId" type="id-ne"></field>
+        <field name="communicationEventId" type="id-ne"></field>
+        <field name="commContentAssocTypeId" type="id"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="sequenceNum" type="numeric"></field>
+        <prim-key field="contentId"/>
+        <prim-key field="communicationEventId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="COMMEV_CA_FROM" title="From" rel-entity-name="Content">
+            <key-map field-name="contentId"/>
+        </relation>
+        <relation type="one" fk-name="COMMEV_CA_COMMEV"  rel-entity-name="CommunicationEvent">
+            <key-map field-name="communicationEventId"/>
+        </relation>
+        <relation type="one" fk-name="COMMEV_CA_TYP" rel-entity-name="CommContentAssocType">
+            <key-map field-name="commContentAssocTypeId"/>
+        </relation>
+    </entity>
+    <view-entity entity-name="CommEventContentDataResource" package-name="org.ofbiz.party.communication" title="CommEvent and Content and DataResource View Entity">
+        <member-entity entity-alias="CECA" entity-name="CommEventContentAssoc"/>
+        <member-entity entity-alias="CO" entity-name="Content"/>
+        <member-entity entity-alias="DR" entity-name="DataResource"/>
+        <alias-all entity-alias="CECA" />
+        <alias-all entity-alias="CO" />
+        <alias-all entity-alias="DR" prefix="dr"/>
+        <view-link entity-alias="CECA" rel-entity-alias="CO" rel-optional="false">
+            <key-map field-name="contentId"/>
+        </view-link>
+        <view-link entity-alias="CO" rel-entity-alias="DR" rel-optional="true">
+            <key-map field-name="dataResourceId"/>
+        </view-link>
+        <relation type="one-nofk" rel-entity-name="ElectronicText">
+            <key-map field-name="dataResourceId" />
+        </relation>
+        <relation type="one-nofk" rel-entity-name="CommunicationEvent">
+            <key-map field-name="communicationEventId" />
+        </relation>
+        <relation type="one-nofk" rel-entity-name="ImageDataResource">
+            <key-map field-name="dataResourceId" />
+        </relation>
+        <relation type="one-nofk" rel-entity-name="OtherDataResource">
+            <key-map field-name="dataResourceId" />
+        </relation>
+        <relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
+            <key-map field-name="contentId" rel-field-name="contentIdStart" />
+        </relation>
+        <relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
+            <key-map field-name="contentId" rel-field-name="contentIdStart" />
+        </relation>
+        <relation type="many" title="From" rel-entity-name="ContentAssoc">
+            <key-map field-name="contentId"/>
+        </relation>
+        <relation type="many" title="To" rel-entity-name="ContentAssoc">
+            <key-map field-name="contentId" rel-field-name="contentIdTo"/>
+        </relation>
+        <relation type="many" rel-entity-name="ContentPurpose">
+            <key-map field-name="contentId"/>
+        </relation>
+        <relation type="many" rel-entity-name="ContentRole">
+            <key-map field-name="contentId"/>
+        </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>