svn commit: r912081 - /ofbiz/trunk/applications/content/entitydef/entitymodel.xml

[lektran]

Author: lektran
Date: Sat Feb 20 06:59:27 2010
New Revision: 912081

URL: http://svn.apache.org/viewvc?rev=912081&view=rev
Log:
Applied patch from Vivek Mishra, alters the recently added ContentAssocAndContentPurpose view entity to remove the warning at startup regarding a duplicated field alias name.  Explicity defines the fields required rather than including all fields from both entities.

Modified:
    ofbiz/trunk/applications/content/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=912081&r1=912080&r2=912081&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Sat Feb 20 06:59:27 2010
@@ -1624,8 +1624,15 @@
             title="ContentAssoc and ContentPurpose View Entity">
         <member-entity entity-alias="CNTA" entity-name="ContentAssoc"/>
         <member-entity entity-alias="CNTP" entity-name="ContentPurpose"/>
-        <alias-all entity-alias="CNTA"/>
-        <alias-all entity-alias="CNTP"/>
+        <alias entity-alias="CNTA" name="contentId"/>
+        <alias entity-alias="CNTA" name="contentIdTo"/>
+        <alias entity-alias="CNTA" name="contentAssocTypeId"/>
+        <alias entity-alias="CNTA" name="fromDate"/>
+        <alias entity-alias="CNTA" name="thruDate"/>
+        <alias entity-alias="CNTA" name="dataSourceId"/>
+        <alias entity-alias="CNTA" name="mapKey"/>
+        <alias entity-alias="CNTP" name="contentPurposeTypeId"/>
+        <alias entity-alias="CNTP" name="sequenceNum"/>
         <view-link entity-alias="CNTA" rel-entity-alias="CNTP">
             <key-map field-name="contentIdTo" rel-field-name="contentId"/>
         </view-link>