svn commit: r1832235 [2/6] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entitydef/ framework/common/entitydef/ framework/entity/entitydef/ framework/entityext/entitydef/ framework/security/entitydef/ framework/service/entitydef/ framework/...

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

svn commit: r1832235 [2/6] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entitydef/ framework/common/entitydef/ framework/entity/entitydef/ framework/entityext/entitydef/ framework/security/entitydef/ framework/service/entitydef/ framework/...

rishi
Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/content-entitymodel.xml Fri May 25 12:19:07 2018
@@ -149,7 +149,7 @@ under the License.
     <entity entity-name="Content"
             package-name="org.apache.ofbiz.content.content"
             default-resource-name="ContentEntityLabels"
-            title="Content Entity">
+            title="Content">
       <field name="contentId" type="id"></field>
       <field name="contentTypeId" type="id"></field>
       <field name="ownerContentId" type="id"><description>Used for permissions checking</description></field>
@@ -232,7 +232,7 @@ under the License.
         <key-map field-name="contentId" rel-field-name="contentIdStart"/>
       </relation>
     </entity>
-    <view-entity entity-name="ContentAndRole" package-name="org.apache.ofbiz.content.content" title="Content And Role View Entity">
+    <view-entity entity-name="ContentAndRole" package-name="org.apache.ofbiz.content.content" title="Content And Role View">
         <member-entity entity-alias="CNT" entity-name="Content"/>
         <member-entity entity-alias="CRLE" entity-name="ContentRole"/>
         <alias-all entity-alias="CNT"/>
@@ -249,7 +249,7 @@ under the License.
     </view-entity>
     <entity entity-name="ContentApproval"
         package-name="org.apache.ofbiz.content.content"
-        title="Content Approval Entity">
+        title="Content Approval">
         <field name="contentApprovalId" type="id"></field>
         <field name="contentId" type="id"></field>
         <field name="contentRevisionSeqId" type="id"></field>
@@ -279,7 +279,7 @@ under the License.
     </entity>
     <entity entity-name="ContentAssoc"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Association Entity">
+            title="Content Association">
       <field name="contentId" type="id"><description>"parent" content</description></field>
       <field name="contentIdTo" type="id"><description>"child" or "sub" content</description></field>
       <field name="contentAssocTypeId" type="id"></field>
@@ -328,7 +328,7 @@ under the License.
     </entity>
     <view-entity entity-name="ContentAssocDataResourceViewFrom"
                 package-name="org.apache.ofbiz.content.content"
-                title="Main Assoc From and DataResource View Entity">
+                title="Main Assoc From and DataResource View">
       <member-entity entity-alias="CO" entity-name="Content"/>
       <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
       <member-entity entity-alias="DR" entity-name="DataResource"/>
@@ -371,7 +371,7 @@ under the License.
     </view-entity>
     <view-entity entity-name="ContentAssocDataResourceViewTo"
                 package-name="org.apache.ofbiz.content.content"
-                title="Main Assoc To and DataResource View Entity">
+                title="Main Assoc To and DataResource View">
       <member-entity entity-alias="CO" entity-name="Content"/>
       <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
       <member-entity entity-alias="DR" entity-name="DataResource"/>
@@ -416,7 +416,7 @@ under the License.
     <entity entity-name="ContentAssocPredicate"
             package-name="org.apache.ofbiz.content.content"
             default-resource-name="ContentEntityLabels"
-            title="Content Association Predicate Entity">
+            title="Content Association Predicate">
       <field name="contentAssocPredicateId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="contentAssocPredicateId"/>
@@ -424,14 +424,14 @@ under the License.
     <entity entity-name="ContentAssocType"
             package-name="org.apache.ofbiz.content.content"
             default-resource-name="ContentEntityLabels"
-            title="Content Association Type Entity">
+            title="Content Association Type">
       <field name="contentAssocTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="contentAssocTypeId"/>
     </entity>
    <view-entity entity-name="ContentAssocViewFrom"
                 package-name="org.apache.ofbiz.content.content"
-                title="Main Assoc From View Entity">
+                title="Main Assoc From View">
       <member-entity entity-alias="CO" entity-name="Content"/>
       <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
       <alias-all entity-alias="CO"/>
@@ -445,7 +445,7 @@ under the License.
     </view-entity>
     <view-entity entity-name="ContentAssocViewTo"
                 package-name="org.apache.ofbiz.content.content"
-                title="Main Assoc To View Entity">
+                title="Main Assoc To View">
       <member-entity entity-alias="CO" entity-name="Content"/>
       <member-entity entity-alias="CA" entity-name="ContentAssoc"/>
       <alias-all entity-alias="CO"/>
@@ -459,7 +459,7 @@ under the License.
     </view-entity>
     <entity entity-name="ContentAttribute"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Attribute Entity">
+            title="Content Attribute">
       <field name="contentId" type="id"></field>
       <field name="attrName" type="id-long"></field>
       <field name="attrValue" type="value"></field>
@@ -475,7 +475,7 @@ under the License.
     </entity>
     <view-entity entity-name="ContentDataResourceView"
                 package-name="org.apache.ofbiz.content.content"
-                title="Content and DataResource View Entity">
+                title="Content and DataResource View">
       <member-entity entity-alias="CO" entity-name="Content"/>
       <member-entity entity-alias="DR" entity-name="DataResource"/>
       <alias-all entity-alias="CO"/>
@@ -513,7 +513,7 @@ under the License.
     </view-entity>
     <entity entity-name="ContentMetaData"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Meta-Data Predicate Entity">
+            title="Content Meta-Data Predicate">
       <field name="contentId" type="id"></field>
       <field name="metaDataPredicateId" type="id"></field>
       <field name="metaDataValue" type="value"></field>
@@ -533,14 +533,14 @@ under the License.
     <entity entity-name="ContentOperation"
             package-name="org.apache.ofbiz.content.content"
             default-resource-name="ContentEntityLabels"
-            title="Content Operation Entity">
+            title="Content Operation">
       <field name="contentOperationId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="contentOperationId"/>
     </entity>
     <entity entity-name="ContentPurpose"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Purpose Entity">
+            title="Content Purpose">
       <field name="contentId" type="id"></field>
       <field name="contentPurposeTypeId" type="id"></field>
       <field name="sequenceNum" type="numeric"></field>
@@ -555,7 +555,7 @@ under the License.
     </entity>
     <entity entity-name="ContentPurposeOperation"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Purpose Entity">
+            title="Content Purpose">
       <field name="contentPurposeTypeId" type="id"></field>
       <field name="contentOperationId" type="id"></field>
       <field name="roleTypeId" type="id"></field>
@@ -585,14 +585,14 @@ under the License.
     <entity entity-name="ContentPurposeType"
             package-name="org.apache.ofbiz.content.content"
             default-resource-name="ContentEntityLabels"
-            title="Content Purpose Type Entity">
+            title="Content Purpose Type">
       <field name="contentPurposeTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="contentPurposeTypeId"/>
     </entity>
     <entity entity-name="ContentRevision"
         package-name="org.apache.ofbiz.content.content"
-        title="Content Revision Entity">
+        title="Content Revision">
         <field name="contentId" type="id"></field>
         <field name="contentRevisionSeqId" type="id"></field>
         <field name="committedByPartyId" type="id"></field>
@@ -608,7 +608,7 @@ under the License.
     </entity>
     <entity entity-name="ContentRevisionItem"
         package-name="org.apache.ofbiz.content.content"
-        title="Content Revision Entity">
+        title="Content Revision">
         <field name="contentId" type="id"></field>
         <field name="contentRevisionSeqId" type="id"></field>
         <field name="itemContentId" type="id"></field>
@@ -630,7 +630,7 @@ under the License.
     </entity>
     <entity entity-name="ContentRole"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Role Entity">
+            title="Content Role">
       <field name="contentId" type="id"></field>
       <field name="partyId" type="id"></field>
       <field name="roleTypeId" type="id"></field>
@@ -654,7 +654,7 @@ under the License.
     <entity entity-name="ContentType"
             package-name="org.apache.ofbiz.content.content"
             default-resource-name="ContentEntityLabels"
-            title="Content Type Entity">
+            title="Content Type">
       <field name="contentTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -666,7 +666,7 @@ under the License.
     </entity>
     <entity entity-name="ContentTypeAttr"
             package-name="org.apache.ofbiz.content.content"
-            title="Content Type Attribute Entity">
+            title="Content Type Attribute">
       <field name="contentTypeId" type="id"></field>
       <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
@@ -684,7 +684,7 @@ under the License.
     </entity>
     <view-entity entity-name="SubContentDataResourceView"
                 package-name="org.apache.ofbiz.content.content"
-                title="Content and DataResource for SubContent View Entity">
+                title="Content and DataResource for SubContent View">
       <member-entity entity-alias="CO" entity-name="Content"/>
       <member-entity entity-alias="DR" entity-name="DataResource"/>
       <alias-all entity-alias="CO"/>
@@ -727,7 +727,7 @@ under the License.
 
     <entity entity-name="AudioDataResource"
             package-name="org.apache.ofbiz.content.data"
-            title="Audio Data Object Entity">
+            title="Audio Data Object">
       <field name="dataResourceId" type="id"></field>
       <field name="audioData" type="byte-array"></field>
       <prim-key field="dataResourceId"/>
@@ -738,7 +738,7 @@ under the License.
     <entity entity-name="CharacterSet"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Character Set Entity">
+            title="Character Set">
       <field name="characterSetId" type="id-long"></field>
       <field name="description" type="description"></field>
       <prim-key field="characterSetId"/>
@@ -746,7 +746,7 @@ under the License.
     <entity entity-name="DataCategory"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Data Category Entity">
+            title="Data Category">
       <field name="dataCategoryId" type="id"></field>
       <field name="parentCategoryId" type="id"></field>
       <field name="categoryName" type="name"></field>
@@ -760,7 +760,7 @@ under the License.
     </entity>
     <entity entity-name="DataResource"
             package-name="org.apache.ofbiz.content.data"
-            title="Data Object Entity">
+            title="Data Object">
       <field name="dataResourceId" type="id"></field>
       <field name="dataResourceTypeId" type="id"></field>
       <field name="dataTemplateTypeId" type="id"></field>
@@ -821,7 +821,7 @@ under the License.
     </entity>
     <entity entity-name="DataResourceAttribute"
             package-name="org.apache.ofbiz.content.data"
-            title="Data Object Attribute Entity">
+            title="Data Object Attribute">
       <field name="dataResourceId" type="id"></field>
       <field name="attrName" type="id-long"></field>
       <field name="attrValue" type="value"></field>
@@ -887,7 +887,7 @@ under the License.
     </view-entity>
     <entity entity-name="DataResourceMetaData"
             package-name="org.apache.ofbiz.content.data"
-            title="Data Resource Meta-Data Predicate Entity">
+            title="Data Resource Meta-Data Predicate">
       <field name="dataResourceId" type="id"></field>
       <field name="metaDataPredicateId" type="id"></field>
       <field name="metaDataValue" type="value"></field>
@@ -906,7 +906,7 @@ under the License.
     </entity>
     <entity entity-name="DataResourcePurpose"
             package-name="org.apache.ofbiz.content.data"
-            title="Data Object Purpose Entity">
+            title="Data Object Purpose">
       <field name="dataResourceId" type="id"></field>
       <field name="contentPurposeTypeId" type="id"></field>
       <prim-key field="dataResourceId"/>
@@ -920,7 +920,7 @@ under the License.
     </entity>
     <entity entity-name="DataResourceRole"
             package-name="org.apache.ofbiz.content.data"
-            title="DataResource Role Entity">
+            title="DataResource Role">
       <field name="dataResourceId" type="id"></field>
       <field name="partyId" type="id"></field>
       <field name="roleTypeId" type="id"></field>
@@ -944,7 +944,7 @@ under the License.
     <entity entity-name="DataResourceType"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Data Object Type Entity">
+            title="Data Object Type">
       <field name="dataResourceTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -956,7 +956,7 @@ under the License.
     </entity>
     <entity entity-name="DataResourceTypeAttr"
             package-name="org.apache.ofbiz.content.data"
-            title="Data Object Type Attribute Entity">
+            title="Data Object Type Attribute">
       <field name="dataResourceTypeId" type="id"></field>
       <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
@@ -975,7 +975,7 @@ under the License.
     <entity entity-name="DataTemplateType"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Data Template Type Entity">
+            title="Data Template Type">
       <field name="dataTemplateTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <field name="extension" type="short-varchar"></field>
@@ -983,7 +983,7 @@ under the License.
     </entity>
     <entity entity-name="ElectronicText"
             package-name="org.apache.ofbiz.content.data"
-            title="Electronic Text Entity">
+            title="Electronic Text">
       <field name="dataResourceId" type="id"></field>
       <field name="textData" type="very-long"></field>
       <prim-key field="dataResourceId"/>
@@ -993,7 +993,7 @@ under the License.
     </entity>
     <entity entity-name="FileExtension"
             package-name="org.apache.ofbiz.content.data"
-            title="File Extension Entity">
+            title="File Extension">
       <field name="fileExtensionId" type="id-long"></field>
       <field name="mimeTypeId" type="id-vlong"></field>
       <prim-key field="fileExtensionId"/>
@@ -1003,7 +1003,7 @@ under the License.
     </entity>
     <entity entity-name="ImageDataResource"
             package-name="org.apache.ofbiz.content.data"
-            title="Image Data Object Entity">
+            title="Image Data Object">
       <field name="dataResourceId" type="id"></field>
       <field name="imageData" type="byte-array"></field>
       <prim-key field="dataResourceId"/>
@@ -1014,7 +1014,7 @@ under the License.
     <entity entity-name="MetaDataPredicate"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Data Meta-Data Predicate Entity">
+            title="Data Meta-Data Predicate">
       <field name="metaDataPredicateId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="metaDataPredicateId"/>
@@ -1022,7 +1022,7 @@ under the License.
     <entity entity-name="MimeType"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Mime Type Entity">
+            title="Mime Type">
       <field name="mimeTypeId" type="id-vlong"></field>
       <field name="description" type="description"></field>
       <prim-key field="mimeTypeId"/>
@@ -1030,7 +1030,7 @@ under the License.
     <entity entity-name="MimeTypeHtmlTemplate"
             package-name="org.apache.ofbiz.content.data"
             default-resource-name="ContentEntityLabels"
-            title="Mime Text Template Entity">
+            title="Mime Text Template">
       <field name="mimeTypeId" type="id-vlong"></field>
       <field name="templateLocation" type="long-varchar"></field>
       <prim-key field="mimeTypeId"/>
@@ -1040,7 +1040,7 @@ under the License.
     </entity>
     <entity entity-name="OtherDataResource"
             package-name="org.apache.ofbiz.content.data"
-            title="Other Data Object Entity">
+            title="Other Data Object">
       <field name="dataResourceId" type="id"></field>
       <field name="dataResourceContent" type="byte-array"></field>
       <prim-key field="dataResourceId"/>
@@ -1050,7 +1050,7 @@ under the License.
     </entity>
     <entity entity-name="VideoDataResource"
             package-name="org.apache.ofbiz.content.data"
-            title="Video Data Object Entity">
+            title="Video Data Object">
       <field name="dataResourceId" type="id"></field>
       <field name="videoData" type="byte-array"></field>
       <prim-key field="dataResourceId"/>
@@ -1065,7 +1065,7 @@ under the License.
 
     <entity entity-name="Document"
             package-name="org.apache.ofbiz.content.document"
-            title="Document Entity">
+            title="Document">
       <field name="documentId" type="id"></field>
       <field name="documentTypeId" type="id"></field>
       <field name="dateCreated" type="date-time"></field>
@@ -1083,7 +1083,7 @@ under the License.
     </entity>
     <entity entity-name="DocumentAttribute"
             package-name="org.apache.ofbiz.content.document"
-            title="Document Attribute Entity">
+            title="Document Attribute">
       <field name="documentId" type="id"></field>
       <field name="attrName" type="id-long"></field>
       <field name="attrValue" type="value"></field>
@@ -1100,7 +1100,7 @@ under the License.
     <entity entity-name="DocumentType"
             package-name="org.apache.ofbiz.content.document"
             default-resource-name="ContentEntityLabels"
-            title="Document Type Entity">
+            title="Document Type">
       <field name="documentTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -1112,7 +1112,7 @@ under the License.
     </entity>
     <entity entity-name="DocumentTypeAttr"
             package-name="org.apache.ofbiz.content.document"
-            title="Document Type Attribute Entity">
+            title="Document Type Attribute">
       <field name="documentTypeId" type="id"></field>
       <field name="attrName" type="id-long"></field>
       <field name="description" type="description"></field>
@@ -1135,14 +1135,14 @@ under the License.
 
     <entity entity-name="WebPreferenceType"
             package-name="org.apache.ofbiz.content.preference"
-            title="Web Preference Type Entity">
+            title="Web Preference Type">
       <field name="webPreferenceTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="webPreferenceTypeId"/>
     </entity>
     <entity entity-name="WebUserPreference"
             package-name="org.apache.ofbiz.content.preference"
-            title="Web User Preference Entity">
+            title="Web User Preference">
       <field name="userLoginId" type="id-vlong"></field>
       <field name="partyId" type="id"></field>
       <field name="visitId" type="id"><description>To be able to keep preferences for a non loggin in user for the current session</description></field>
@@ -1169,7 +1169,7 @@ under the License.
 
     <entity entity-name="Survey"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Entity">
+            title="Survey">
       <field name="surveyId" type="id"/>
       <field name="surveyName" type="name"/>
       <field name="description" type="description"/>
@@ -1185,14 +1185,14 @@ under the License.
     <entity entity-name="SurveyApplType"
             package-name="org.apache.ofbiz.content.survey"
             default-resource-name="ContentEntityLabels"
-            title="Survey Application Type Entity">
+            title="Survey Application Type">
       <field name="surveyApplTypeId" type="id"/>
       <field name="description" type="description"/>
       <prim-key field="surveyApplTypeId"/>
     </entity>
     <entity entity-name="SurveyMultiResp"
         package-name="org.apache.ofbiz.content.survey"
-        title="Survey Multi-Response Group Entity">
+        title="Survey Multi-Response Group">
         <field name="surveyId" type="id"/>
         <field name="surveyMultiRespId" type="id"/>
         <field name="multiRespTitle" type="name"/>
@@ -1204,7 +1204,7 @@ under the License.
     </entity>
     <entity entity-name="SurveyMultiRespColumn"
         package-name="org.apache.ofbiz.content.survey"
-        title="Survey Multi-Response Group Column/Category Entity">
+        title="Survey Multi-Response Group Column/Category">
         <field name="surveyId" type="id"/>
         <field name="surveyMultiRespId" type="id"/>
         <field name="surveyMultiRespColId" type="id"/>
@@ -1220,7 +1220,7 @@ under the License.
     </entity>
     <entity entity-name="SurveyPage"
         package-name="org.apache.ofbiz.content.survey"
-        title="Survey Page Type Entity">
+        title="Survey Page Type">
         <field name="surveyId" type="id"/>
         <field name="surveyPageSeqId" type="id"/>
         <field name="pageName" type="name"/>
@@ -1233,7 +1233,7 @@ under the License.
     </entity>
     <entity entity-name="SurveyQuestion"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Question Entity">
+            title="Survey Question">
       <field name="surveyQuestionId" type="id"/>
       <field name="surveyQuestionCategoryId" type="id"/>
       <field name="surveyQuestionTypeId" type="id"/>
@@ -1260,7 +1260,7 @@ under the License.
     </entity>
     <view-entity entity-name="SurveyQuestionAndAppl"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Question And Application View Entity">
+            title="Survey Question And Application View">
       <member-entity entity-alias="SQ" entity-name="SurveyQuestion"/>
       <member-entity entity-alias="SA" entity-name="SurveyQuestionAppl"/>
       <alias-all entity-alias="SQ"/>
@@ -1302,7 +1302,7 @@ under the License.
     </view-entity>
     <entity entity-name="SurveyQuestionAppl"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Question Application Entity">
+            title="Survey Question Application">
       <field name="surveyId" type="id"/>
       <field name="surveyQuestionId" type="id"/>
       <field name="fromDate" type="date-time"/>
@@ -1346,7 +1346,7 @@ under the License.
     </entity>
     <entity entity-name="SurveyQuestionCategory"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Question Category Entity">
+            title="Survey Question Category">
       <field name="surveyQuestionCategoryId" type="id"/>
       <field name="parentCategoryId" type="id"/>
       <field name="description" type="description"/>
@@ -1357,7 +1357,7 @@ under the License.
     </entity>
     <entity entity-name="SurveyQuestionOption"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Question Option Entity">
+            title="Survey Question Option">
       <field name="surveyQuestionId" type="id"/>
       <field name="surveyOptionSeqId" type="id"/>
       <field name="description" type="description"/>
@@ -1376,14 +1376,14 @@ under the License.
     <entity entity-name="SurveyQuestionType"
             package-name="org.apache.ofbiz.content.survey"
             default-resource-name="ContentEntityLabels"
-            title="Survey Question Type Entity">
+            title="Survey Question Type">
       <field name="surveyQuestionTypeId" type="id"/>
       <field name="description" type="description"/>
       <prim-key field="surveyQuestionTypeId"/>
     </entity>
     <entity entity-name="SurveyResponse"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Response Entity">
+            title="Survey Response">
       <field name="surveyResponseId" type="id"></field>
       <field name="surveyId" type="id"></field>
       <field name="partyId" type="id"></field>
@@ -1414,7 +1414,7 @@ under the License.
     </entity>
     <view-entity entity-name="SurveyResponseAndAnswer"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Response And Answer View Entity">
+            title="Survey Response And Answer View">
       <member-entity entity-alias="SR" entity-name="SurveyResponse"/>
       <member-entity entity-alias="SRA" entity-name="SurveyResponseAnswer"/>
       <alias-all entity-alias="SR"/>
@@ -1446,7 +1446,7 @@ under the License.
     </view-entity>
     <entity entity-name="SurveyResponseAnswer"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Response Answer Entity">
+            title="Survey Response Answer">
       <field name="surveyResponseId" type="id"></field>
       <field name="surveyQuestionId" type="id"></field>
       <field name="surveyMultiRespColId" type="id"><description>This is needed to support multiple responses for different MultiResp Columns; if not part of a MultiResp will be _NA_</description></field>
@@ -1484,7 +1484,7 @@ under the License.
     </entity>
     <entity entity-name="SurveyTrigger"
             package-name="org.apache.ofbiz.content.survey"
-            title="Survey Trigger Entity">
+            title="Survey Trigger">
       <field name="surveyId" type="id"/>
       <field name="surveyApplTypeId" type="id"/>
       <field name="fromDate" type="date-time"/>
@@ -1596,7 +1596,7 @@ under the License.
             <key-map field-name="contentId"/>
         </relation>
     </entity>
-    <entity entity-name="WebSiteRole" package-name="org.apache.ofbiz.party.party" title="WebSite Role Association Entity">
+    <entity entity-name="WebSiteRole" package-name="org.apache.ofbiz.party.party" title="WebSite Role Association">
         <field name="partyId" type="id"></field>
         <field name="roleTypeId" type="id"></field>
         <field name="webSiteId" type="id"></field>
@@ -1629,7 +1629,7 @@ under the License.
     </entity>
     <view-entity entity-name="ContentAssocAndContentPurpose"
             package-name="org.apache.ofbiz.content.compdoc"
-            title="ContentAssoc and ContentPurpose View Entity">
+            title="ContentAssoc and ContentPurpose View">
         <member-entity entity-alias="CNTA" entity-name="ContentAssoc"/>
         <member-entity entity-alias="CNTP" entity-name="ContentPurpose"/>
         <alias entity-alias="CNTA" name="contentId"/>
@@ -1654,7 +1654,7 @@ under the License.
         </relation>
     </extend-entity>
     
-    <entity entity-name="ContentKeyword" package-name="org.apache.ofbiz.content.content" title="Content Keyword Entity" never-cache="true">
+    <entity entity-name="ContentKeyword" package-name="org.apache.ofbiz.content.content" title="Content Keyword" never-cache="true">
       <field name="contentId" type="id"></field>
       <field name="keyword" type="short-varchar"></field>
       <field name="relevancyWeight" type="numeric"></field>
@@ -1667,7 +1667,7 @@ under the License.
         <index-field name="keyword"/>
       </index>
     </entity>
-    <entity entity-name="ContentSearchConstraint" package-name="org.apache.ofbiz.content.content" never-cache="true" title="Content Search Result Constraint Entity">
+    <entity entity-name="ContentSearchConstraint" package-name="org.apache.ofbiz.content.content" never-cache="true" title="Content Search Result Constraint">
       <field name="contentSearchResultId" type="id"></field>
       <field name="constraintSeqId" type="id"></field>
       <field name="constraintName" type="long-varchar"></field>
@@ -1688,7 +1688,7 @@ under the License.
     <entity entity-name="ContentSearchResult"
             package-name="org.apache.ofbiz.content.content"
             never-cache="true"
-            title="Content Search Result Entity">
+            title="Content Search Result">
       <field name="contentSearchResultId" type="id"></field>
       <field name="visitId" type="id"></field>
       <field name="orderByName" type="long-varchar"></field>
@@ -1716,7 +1716,7 @@ under the License.
     </entity>
 
     <entity entity-name="WebAnalyticsType" package-name="org.apache.ofbiz.content.website"
-        title="Web Analytics Type Entity">
+        title="Web Analytics Type">
         <field name="webAnalyticsTypeId" type="id"></field>
         <field name="parentTypeId" type="id"></field>
         <field name="hasTable" type="indicator"></field>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/humanres-entitymodel.xml Fri May 25 12:19:07 2018
@@ -42,7 +42,7 @@ under the License.
 
     <entity entity-name="PartyQual"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Party Qualification Entity">
+            title="Party Qualification">
         <field name="partyId" type="id"></field>
         <field name="partyQualTypeId" type="id"></field>
         <field name="qualificationDesc" type="id-long"></field>
@@ -70,7 +70,7 @@ under the License.
 
     <entity entity-name="PartyQualType"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Party Qualification Type Entity">
+            title="Party Qualification Type">
       <field name="partyQualTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -82,7 +82,7 @@ under the License.
     </entity>
     <entity entity-name="PartyResume"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Resume Entity">
+            title="Resume">
       <field name="resumeId" type="id"></field>
       <field name="partyId" type="id"></field>
       <field name="contentId" type="id"></field>
@@ -98,7 +98,7 @@ under the License.
     </entity>
     <entity entity-name="PartySkill"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Party Skill Entity">
+            title="Party Skill">
       <field name="partyId" type="id"></field>
       <field name="skillTypeId" type="id"></field>
       <field name="yearsExperience" type="numeric"></field>
@@ -116,7 +116,7 @@ under the License.
     </entity>
     <entity entity-name="PerfRatingType"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Performance Rating Type Entity">
+            title="Performance Rating Type">
       <field name="perfRatingTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -128,7 +128,7 @@ under the License.
     </entity>
     <entity entity-name="PerfReview"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Employee Performance Review Entity">
+            title="Employee Performance Review">
       <field name="employeePartyId" type="id"></field>
       <field name="employeeRoleTypeId" type="id"></field>
       <field name="perfReviewId" type="id"></field>
@@ -165,7 +165,7 @@ under the License.
     </entity>
     <entity entity-name="PerfReviewItem"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Performance Review Item Entity">
+            title="Performance Review Item">
       <field name="employeePartyId" type="id"></field>
       <field name="employeeRoleTypeId" type="id"></field>
       <field name="perfReviewId" type="id"></field>
@@ -198,7 +198,7 @@ under the License.
     </entity>
     <entity entity-name="PerfReviewItemType"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Performance Review Item Type Entity">
+            title="Performance Review Item Type">
       <field name="perfReviewItemTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -210,7 +210,7 @@ under the License.
     </entity>
     <entity entity-name="PerformanceNote"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Performance Note Entity">
+            title="Performance Note">
       <field name="partyId" type="id"></field>
       <field name="roleTypeId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -230,7 +230,7 @@ under the License.
     </entity>
     <entity entity-name="PersonTraining"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Person Training Entity">
+            title="Person Training">
       <field name="partyId" type="id"></field>
       <field name="trainingRequestId" type="id"></field>
       <field name="trainingClassTypeId" type="id"></field>
@@ -261,7 +261,7 @@ under the License.
     </entity>
     <entity entity-name="ResponsibilityType"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Responsibility Type Entity">
+            title="Responsibility Type">
       <field name="responsibilityTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -273,7 +273,7 @@ under the License.
     </entity>
     <entity entity-name="SkillType"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Skill Type Entity">
+            title="Skill Type">
       <field name="skillTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -285,7 +285,7 @@ under the License.
     </entity>
     <entity entity-name="TrainingClassType"
             package-name="org.apache.ofbiz.humanres.ability"
-            title="Training Class Type Entity">
+            title="Training Class Type">
       <field name="trainingClassTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -302,7 +302,7 @@ under the License.
 
     <entity entity-name="BenefitType"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Benefit Type Entity">
+            title="Benefit Type">
       <field name="benefitTypeId" type="id"></field>
       <field name="benefitName" type="name"></field>
       <field name="parentTypeId" type="id"></field>
@@ -316,7 +316,7 @@ under the License.
     </entity>
     <view-entity entity-name="BenefitTypeAndParty"
              package-name="org.apache.ofbiz.humanres.employment"
-             title="Benefit Type Entity">
+             title="Benefit Type">
       <member-entity entity-alias="BT" entity-name="BenefitType"/>
       <member-entity entity-alias="PB" entity-name="PartyBenefit"/>
       <alias-all entity-alias="BT"/>
@@ -329,7 +329,7 @@ under the License.
     </view-entity>
     <entity entity-name="Employment"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Employment Entity">
+            title="Employment">
       <field name="roleTypeIdFrom" type="id"></field>
       <field name="roleTypeIdTo" type="id"></field>
       <field name="partyIdFrom" type="id"></field>
@@ -370,7 +370,7 @@ under the License.
     </entity>
     <view-entity entity-name="EmploymentAndPerson"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Employment and Person Entity">
+            title="Employment and Person">
         <member-entity entity-alias="EMPLMNT" entity-name="Employment"/>
         <member-entity entity-alias="PERS" entity-name="Person"/>
         <alias-all entity-alias="EMPLMNT"/>
@@ -382,7 +382,7 @@ under the License.
 
     <entity entity-name="EmploymentApp"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Employment Application Entity">
+            title="Employment Application">
       <field name="applicationId" type="id"></field>
       <field name="emplPositionId" type="id"></field>
       <field name="statusId" type="id"></field>
@@ -417,7 +417,7 @@ under the License.
     </entity>
     <entity entity-name="EmploymentAppSourceType"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Employment Application Source Type Entity">
+            title="Employment Application Source Type">
       <field name="employmentAppSourceTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -429,7 +429,7 @@ under the License.
     </entity>
     <entity entity-name="EmplLeave"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Employee Leave Entity">
+            title="Employee Leave">
         <field name="partyId" type="id"/>
         <field name="leaveTypeId" type="id"/>
         <field name="emplLeaveReasonTypeId" type="id"/>
@@ -460,7 +460,7 @@ under the License.
     <entity entity-name="EmplLeaveType"
             package-name="org.apache.ofbiz.humanres.employment"
             default-resource-name="HumanResEntityLabels"
-            title="Employee Leave Type Entity">
+            title="Employee Leave Type">
         <field name="leaveTypeId" type="id"/>
         <field name="parentTypeId" type="id"/>
         <field name="hasTable" type="indicator"/>
@@ -472,7 +472,7 @@ under the License.
     </entity>
     <entity entity-name="PartyBenefit"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Party Benefit Entity">
+            title="Party Benefit">
       <field name="roleTypeIdFrom" type="id"></field>
       <field name="roleTypeIdTo" type="id"></field>
       <field name="partyIdFrom" type="id"></field>
@@ -513,7 +513,7 @@ under the License.
     </entity>
     <entity entity-name="PayGrade"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Pay Grade Entity">
+            title="Pay Grade">
       <field name="payGradeId" type="id"></field>
       <field name="payGradeName" type="name"></field>
       <field name="comments" type="comment"></field>
@@ -521,7 +521,7 @@ under the License.
     </entity>
     <entity entity-name="PayHistory"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Pay History Entity">
+            title="Pay History">
       <field name="roleTypeIdFrom" type="id"></field>
       <field name="roleTypeIdTo" type="id"></field>
       <field name="partyIdFrom" type="id"></field>
@@ -559,7 +559,7 @@ under the License.
     </entity>
     <entity entity-name="PayrollPreference"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Payroll Preference Entity">
+            title="Payroll Preference">
       <field name="partyId" type="id"></field>
       <field name="roleTypeId" type="id"></field>
       <field name="payrollPreferenceSeqId" type="id"></field>
@@ -595,7 +595,7 @@ under the License.
     </entity>
     <entity entity-name="SalaryStep" table-name="SALARY_STEP_NEW"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Salary Step Entity">
+            title="Salary Step">
       <field name="salaryStepSeqId" type="id"></field>
       <field name="payGradeId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -613,14 +613,14 @@ under the License.
     </entity>
     <entity entity-name="TerminationReason"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Termination Reason Entity">
+            title="Termination Reason">
       <field name="terminationReasonId" type="id"></field>
       <field name="description" type="description"></field>
       <prim-key field="terminationReasonId"/>
     </entity>
     <entity entity-name="TerminationType"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Termination Type Entity">
+            title="Termination Type">
       <field name="terminationTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -632,7 +632,7 @@ under the License.
     </entity>
     <entity entity-name="UnemploymentClaim"
             package-name="org.apache.ofbiz.humanres.employment"
-            title="Unemployment Claim Entity">
+            title="Unemployment Claim">
       <field name="unemploymentClaimId" type="id"></field>
       <field name="unemploymentClaimDate" type="date-time"></field>
       <field name="description" type="description"></field>
@@ -662,7 +662,7 @@ under the License.
 
     <entity entity-name="EmplPosition"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Entity">
+            title="EmplPosition">
       <field name="emplPositionId" type="id"></field>
       <field name="statusId" type="id"></field>
       <field name="partyId" type="id"></field>
@@ -694,7 +694,7 @@ under the License.
     </entity>
     <entity entity-name="EmplPositionClassType"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Classification Type Entity">
+            title="EmplPosition Classification Type">
       <field name="emplPositionClassTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -706,7 +706,7 @@ under the License.
     </entity>
     <entity entity-name="EmplPositionFulfillment"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Fulfillment Entity">
+            title="EmplPosition Fulfillment">
       <field name="emplPositionId" type="id"></field>
       <field name="partyId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -724,7 +724,7 @@ under the License.
     </entity>
     <view-entity entity-name="EmplPositionAndFulfillment"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Fulfillment Entity">
+            title="EmplPosition Fulfillment">
       <member-entity entity-alias="EMPPOS" entity-name="EmplPosition"></member-entity>
       <member-entity entity-alias="EPF" entity-name="EmplPositionFulfillment"></member-entity>
       <alias-all entity-alias="EMPPOS"/>
@@ -740,7 +740,7 @@ under the License.
     </view-entity>
     <entity entity-name="EmplPositionReportingStruct"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Reporting Structure Entity">
+            title="EmplPosition Reporting Structure">
       <field name="emplPositionIdReportingTo" type="id"></field>
       <field name="emplPositionIdManagedBy" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -759,7 +759,7 @@ under the License.
     </entity>
     <entity entity-name="EmplPositionResponsibility"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Responsibility Entity">
+            title="EmplPosition Responsibility">
       <field name="emplPositionId" type="id"></field>
       <field name="responsibilityTypeId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -777,7 +777,7 @@ under the License.
     </entity>
     <entity entity-name="EmplPositionType"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Type Entity">
+            title="EmplPosition Type">
       <field name="emplPositionTypeId" type="id"></field>
       <field name="parentTypeId" type="id"></field>
       <field name="hasTable" type="indicator"></field>
@@ -789,7 +789,7 @@ under the License.
     </entity>
     <entity entity-name="EmplPositionTypeClass"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Type Class Entity">
+            title="EmplPosition Type Class">
       <field name="emplPositionTypeId" type="id"></field>
       <field name="emplPositionClassTypeId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -807,7 +807,7 @@ under the License.
     </entity>
     <entity entity-name="ValidResponsibility"
             package-name="org.apache.ofbiz.humanres.position"
-            title="Valid Responsibility Entity">
+            title="Valid Responsibility">
       <field name="emplPositionTypeId" type="id"></field>
       <field name="responsibilityTypeId" type="id"></field>
       <field name="fromDate" type="date-time"></field>
@@ -825,7 +825,7 @@ under the License.
     </entity>
     <entity entity-name="EmplPositionTypeRate" table-name="EMPL_POSITION_TYPE_RATE_NEW"
             package-name="org.apache.ofbiz.humanres.position"
-            title="EmplPosition Type Rate Entity">
+            title="EmplPosition Type Rate">
     <field name="emplPositionTypeId" type="id"/>
     <field name="rateTypeId" type="id"/>
     <field name="payGradeId" type="id"/>
@@ -950,14 +950,14 @@ under the License.
     </view-entity>
     <entity entity-name="TrainingRequest"
             package-name="org.apache.ofbiz.humanres.trainings"
-            title="Training Request Entity">
+            title="Training Request">
         <field name="trainingRequestId" type="id"></field>
         <prim-key field="trainingRequestId"/>
     </entity>
     <entity entity-name="EmplLeaveReasonType"
             package-name="org.apache.ofbiz.humanres.employment"
             default-resource-name="HumanResEntityLabels"
-            title="Leave Reason Type Entity">
+            title="Leave Reason Type">
         <field name="emplLeaveReasonTypeId" type="id"/>
         <field name="parentTypeId" type="id"/>
         <field name="hasTable" type="indicator"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/manufacturing-entitymodel.xml Fri May 25 12:19:07 2018
@@ -42,7 +42,7 @@ under the License.
 
     <entity entity-name="ProductManufacturingRule"
             package-name="org.apache.ofbiz.manufacturing.bom"
-            title="Product To Part Rule Entity">
+            title="Product To Part Rule">
       <field name="ruleId" type="id"></field>
       <field name="productId" type="id"></field>
       <field name="productIdFor" type="id"></field>
@@ -80,7 +80,7 @@ under the License.
     <entity entity-name="TechDataCalendar"
             package-name="org.apache.ofbiz.manufacturing.techdata"
             default-resource-name="ManufacturingEntityLabels"
-            title="Calendar entity">
+            title="Calendar">
       <description>Used to defined the availability of the machines, this entity define the Id and the week definition.
       The Id is used in the exception calendar table as reference
       </description>
@@ -94,7 +94,7 @@ under the License.
     </entity>
     <entity entity-name="TechDataCalendarExcDay"
             package-name="org.apache.ofbiz.manufacturing.techdata"
-            title="Calendar Exception Day entity">
+            title="Calendar Exception Day">
       <description>Used to defined some days which differ from the normal day definition in the weekId associated in the calendar.
       </description>
       <field name="calendarId" type="id"></field>
@@ -110,7 +110,7 @@ under the License.
     </entity>
     <entity entity-name="TechDataCalendarExcWeek"
             package-name="org.apache.ofbiz.manufacturing.techdata"
-            title="Calendar Exception Week entity">
+            title="Calendar Exception Week">
       <description>Used to defined some weeks which differ from the normal week defined in the calendar.</description>
       <field name="calendarId" type="id"></field>
       <field name="exceptionDateStart" type="date"></field>
@@ -128,7 +128,7 @@ under the License.
     <entity entity-name="TechDataCalendarWeek"
             package-name="org.apache.ofbiz.manufacturing.techdata"
             default-resource-name="ManufacturingEntityLabels"
-            title="Week definition entity">
+            title="Week definition">
       <description>Used to defined the week definition disponibility for machine</description>
       <field name="calendarWeekId" type="id"></field>
       <field name="description" type="description"></field>

Modified: ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml?rev=1832235&r1=1832234&r2=1832235&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml Fri May 25 12:19:07 2018
@@ -43,7 +43,7 @@ under the License.
 
     <entity entity-name="MarketingCampaign"
             package-name="org.apache.ofbiz.marketing.campaign"
-            title="Marketing Campaign Entity">
+            title="Marketing Campaign">
         <field name="marketingCampaignId" type="id"/>
         <field name="parentCampaignId" type="id"/>
         <field name="statusId" type="id"/>
@@ -76,7 +76,7 @@ under the License.
     </entity>
     <entity entity-name="MarketingCampaignNote"
             package-name="org.apache.ofbiz.marketing.campaign"
-            title="Marketing Campaign Note Entity">
+            title="Marketing Campaign Note">
         <field name="marketingCampaignId" type="id"/>
         <field name="noteId" type="id"/>
         <prim-key field="marketingCampaignId"/>
@@ -90,7 +90,7 @@ under the License.
     </entity>
     <entity entity-name="MarketingCampaignPrice"
             package-name="org.apache.ofbiz.marketing.campaign"
-            title="Marketing Campaign Price Entity">
+            title="Marketing Campaign Price">
         <field name="marketingCampaignId" type="id"/>
         <field name="productPriceRuleId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -107,7 +107,7 @@ under the License.
     </entity>
     <entity entity-name="MarketingCampaignPromo"
             package-name="org.apache.ofbiz.marketing.campaign"
-            title="Marketing Campaign Promo Entity">
+            title="Marketing Campaign Promo">
         <field name="marketingCampaignId" type="id"/>
         <field name="productPromoId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -124,7 +124,7 @@ under the License.
     </entity>
     <entity entity-name="MarketingCampaignRole"
             package-name="org.apache.ofbiz.marketing.campaign"
-            title="Marketing Campaign Role Entity">
+            title="Marketing Campaign Role">
         <field name="marketingCampaignId" type="id"/>
         <field name="partyId" type="id"/>
         <field name="roleTypeId" type="id"/>
@@ -155,7 +155,7 @@ under the License.
 
     <entity entity-name="ContactList"
             package-name="org.apache.ofbiz.marketing.contact"
-            title="Contact List Entity">
+            title="Contact List">
         <field name="contactListId" type="id"/>
         <field name="contactListTypeId" type="id"/>
         <field name="contactMechTypeId" type="id"/>
@@ -195,7 +195,7 @@ under the License.
     </entity>
     <entity entity-name="WebSiteContactList"
             package-name="org.apache.ofbiz.marketing.contact"
-            title="Web Site Contact List Entity">
+            title="Web Site Contact List">
         <field name="webSiteId" type="id"/>
         <field name="contactListId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -212,7 +212,7 @@ under the License.
     </entity>
     <entity entity-name="ContactListCommStatus"
             package-name="org.apache.ofbiz.marketing.contact"
-            title="Contact List Entity">
+            title="Contact List">
         <field name="contactListId" type="id"/>
         <field name="communicationEventId" type="id"/>
         <field name="contactMechId" type="id"/>
@@ -247,7 +247,7 @@ under the License.
     </entity>
     <entity entity-name="ContactListParty"
             package-name="org.apache.ofbiz.marketing.contact"
-            title="Contact List Party Entity">
+            title="Contact List Party">
         <field name="contactListId" type="id"/>
         <field name="partyId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -282,7 +282,7 @@ under the License.
     </view-entity>
     <entity entity-name="ContactListPartyStatus"
             package-name="org.apache.ofbiz.marketing.contact"
-            title="Contact List Party Status Entity">
+            title="Contact List Party Status">
         <field name="contactListId" type="id"/>
         <field name="partyId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -303,7 +303,7 @@ under the License.
     <entity entity-name="ContactListType"
             package-name="org.apache.ofbiz.marketing.contact"
             default-resource-name="MarketingEntityLabels"
-            title="Contact List Type Entity">
+            title="Contact List Type">
         <field name="contactListTypeId" type="id"/>
         <field name="description" type="description"/>
         <prim-key field="contactListTypeId"/>
@@ -315,7 +315,7 @@ under the License.
 
     <entity entity-name="SegmentGroup"
             package-name="org.apache.ofbiz.marketing.segment"
-            title="Segment Group Entity">
+            title="Segment Group">
         <field name="segmentGroupId" type="id"/>
         <field name="segmentGroupTypeId" type="id"/>
         <field name="description" type="description"/>
@@ -330,7 +330,7 @@ under the License.
     </entity>
     <entity entity-name="SegmentGroupClassification"
             package-name="org.apache.ofbiz.marketing.segment"
-            title="Segment Group Classification Entity">
+            title="Segment Group Classification">
         <field name="segmentGroupId" type="id"/>
         <field name="partyClassificationGroupId" type="id"/>
         <prim-key field="segmentGroupId"/>
@@ -344,7 +344,7 @@ under the License.
     </entity>
     <entity entity-name="SegmentGroupGeo"
             package-name="org.apache.ofbiz.marketing.segment"
-            title="Segment Group Geo Entity">
+            title="Segment Group Geo">
         <field name="segmentGroupId" type="id"/>
         <field name="geoId" type="id"/>
         <prim-key field="segmentGroupId"/>
@@ -358,7 +358,7 @@ under the License.
     </entity>
     <entity entity-name="SegmentGroupRole"
             package-name="org.apache.ofbiz.marketing.segment"
-            title="Segment Group Role Entity">
+            title="Segment Group Role">
         <field name="segmentGroupId" type="id"/>
         <field name="partyId" type="id"/>
         <field name="roleTypeId" type="id"/>
@@ -382,7 +382,7 @@ under the License.
     <entity entity-name="SegmentGroupType"
             package-name="org.apache.ofbiz.marketing.segment"
             default-resource-name="MarketingEntityLabels"
-            title="Segment Group Type Entity">
+            title="Segment Group Type">
         <field name="segmentGroupTypeId" type="id"/>
         <field name="description" type="description"/>
         <prim-key field="segmentGroupTypeId"/>
@@ -445,7 +445,7 @@ under the License.
 
     <entity entity-name="TrackingCode"
             package-name="org.apache.ofbiz.marketing.tracking"
-            title="Tracking Code Entity">
+            title="Tracking Code">
         <field name="trackingCodeId" type="id"/>
         <field name="trackingCodeTypeId" type="id"/>
         <field name="marketingCampaignId" type="id"/>
@@ -475,7 +475,7 @@ under the License.
     </entity>
     <entity entity-name="TrackingCodeOrder"
             package-name="org.apache.ofbiz.marketing.tracking"
-            title="Tracking Code Visit Entity">
+            title="Tracking Code Visit">
         <field name="orderId" type="id"/>
         <field name="trackingCodeTypeId" type="id"/>
         <field name="trackingCodeId" type="id"/>
@@ -526,14 +526,14 @@ under the License.
     <entity entity-name="TrackingCodeType"
             package-name="org.apache.ofbiz.marketing.tracking"
             default-resource-name="MarketingEntityLabels"
-            title="Tracking Code Type Entity">
+            title="Tracking Code Type">
         <field name="trackingCodeTypeId" type="id"/>
         <field name="description" type="description"/>
         <prim-key field="trackingCodeTypeId"/>
     </entity>
     <entity entity-name="TrackingCodeVisit"
             package-name="org.apache.ofbiz.marketing.tracking"
-            title="Tracking Code Visit Entity">
+            title="Tracking Code Visit">
         <field name="trackingCodeId" type="id"/>
         <field name="visitId" type="id"/>
         <field name="fromDate" type="date-time"/>
@@ -585,7 +585,7 @@ under the License.
     <view-entity entity-name="TrackingCodeOrderAndOrderHeader"
                  package-name="org.apache.ofbiz.marketing.reports"
                  never-cache="true"
-                 title="Order Header And Tracking Code Order View Entity">
+                 title="Order Header And Tracking Code Order View">
         <member-entity entity-alias="TCO" entity-name="TrackingCodeOrder"/>
         <member-entity entity-alias="OH" entity-name="OrderHeader"/>
         <alias entity-alias="TCO" name="orderId"/>
@@ -604,7 +604,7 @@ under the License.
     <view-entity entity-name="TrackingCodeOrderReturnAndReturnHeader"
                  package-name="org.apache.ofbiz.marketing.reports"
                  never-cache="true"
-                 title="Return Header And Tracking Code Order Return View Entity">
+                 title="Return Header And Tracking Code Order Return View">
         <member-entity entity-alias="TCO" entity-name="TrackingCodeOrderReturn"/>
         <member-entity entity-alias="RH" entity-name="ReturnHeader"/>
         <alias entity-alias="TCO" name="returnId"/>
@@ -750,7 +750,7 @@ under the License.
         </relation>
     </entity>
 
-    <view-entity entity-name="SalesOpportunityAndRole" package-name="org.apache.ofbiz.marketing.opportunity" title="SalesOpportunity And Role View Entity">
+    <view-entity entity-name="SalesOpportunityAndRole" package-name="org.apache.ofbiz.marketing.opportunity" title="SalesOpportunity And Role View">
         <member-entity entity-alias="SO" entity-name="SalesOpportunity"/>
         <member-entity entity-alias="SR" entity-name="SalesOpportunityRole"/>
         <alias-all entity-alias="SO"/>