svn commit: r1715960 - in /ofbiz/trunk/applications/content: script/org/ofbiz/content/content/ContentServices.xml script/org/ofbiz/content/data/DataServices.xml servicedef/services.xml servicedef/services_content.xml servicedef/services_contenttypes.xml

[nmalin]

Author: nmalin
Date: Mon Nov 23 21:26:33 2015
New Revision: 1715960

URL: http://svn.apache.org/viewvc?rev=1715960&view=rev
Log:
 convert entities crud service from simple to entity-auto for :
* DataResourceAttribute
* ContentRole (not for create will set on second step)
* ContentMetaData
* ContentOperation
* ContentPurpose
* ContentPurposeOperation
* ContentAttribute
* ContentKeyword
* ContentType
* ContentAssocType
* ContentAssocPredicate
* ContentPurposeType
I also move some service definition from file services.xml to services_content.xml for all entities that concern content
relate issue OFBIZ-6745

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
    ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
    ofbiz/trunk/applications/content/servicedef/services.xml
    ofbiz/trunk/applications/content/servicedef/services_content.xml
    ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1715960&r1=1715959&r2=1715960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Mon Nov 23 21:26:33 2015
@@ -124,13 +124,6 @@
 
         <store-value value-field="assoc"/>
     </simple-method>
-    <simple-method method-name="removeContentAssoc" short-description="Remove a Content Assoc Record">
-        <make-value entity-name="ContentAssoc" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAssoc" map="lookupKeyValue" value-field="assoc"/>
-
-        <remove-value value-field="assoc"/>
-    </simple-method>
 
     <!-- update content; just status -->
     <simple-method method-name="setContentStatus" short-description="Set The Content Status">
@@ -248,27 +241,6 @@
         <check-errors/>
     </simple-method>
 
-    <!-- Methods for ContentMetaData -->
-    <simple-method method-name="createContentMetaData" short-description="Create Content Meta Data">
-        <make-value entity-name="ContentMetaData" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateContentMetaData" short-description="Update Content Meta Data">
-        <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data">
-        <make-value entity-name="ContentMetaData" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentMetaData" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- Methods for ContentRole -->
     <simple-method method-name="createContentRole" short-description="Create Content Role">
         <if-empty field="parameters.fromDate">
@@ -299,13 +271,6 @@
         </if-empty>
         <check-errors/>
     </simple-method>
-    <simple-method method-name="updateContentRole" short-description="Update Content Role">
-        <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
     <simple-method method-name="deactivateAllContentRoles" short-description="Update Content Role">
         <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
         <set from-field="parameters.contentId" field="lookupKeyValue.contentId"/>
@@ -318,208 +283,13 @@
             <store-value value-field="role"/>
         </iterate>
     </simple-method>
-    <simple-method method-name="removeContentRole" short-description="Remove Content Role">
-        <make-value entity-name="ContentRole" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentRole" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
 
-
-  <!-- Methods for ContentType -->
-    <simple-method method-name="createContentType" short-description="Create Content Type">
-        <make-value entity-name="ContentType" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <field-to-result result-name="contentTypeId" field="newEntity.contentTypeId"/>
-    </simple-method>
-    <simple-method method-name="updateContentType" short-description="Update Content Type">
-        <make-value entity-name="ContentType" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentType" short-description="Remove Content Type">
-        <make-value entity-name="ContentType" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentTypeAttr -->
-    <simple-method method-name="createContentTypeAttr" short-description="Create Content TypeAttr">
-        <make-value entity-name="ContentTypeAttr" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="removeContentTypeAttr" short-description="Remove Content TypeAttr">
-        <make-value entity-name="ContentTypeAttr" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentTypeAttr" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentAssocType -->
-    <simple-method method-name="createContentAssocType" short-description="Create Content AssocType">
-        <make-value entity-name="ContentAssocType" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <field-to-result result-name="contentAssocTypeId" field="newEntity.contentAssocTypeId"/>
-    </simple-method>
-    <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType">
-        <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentAssocType" short-description="Remove Content AssocType">
-        <make-value entity-name="ContentAssocType" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAssocType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentPurposeType -->
-    <simple-method method-name="createContentPurposeType" short-description="Create Content PurposeType">
-        <make-value entity-name="ContentPurposeType" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.contentPurposeTypeId">
-            <make-next-seq-id seq-field-name="contentPurposeTypeId" value-field="newEntity"/>
-        </if-empty>
-        <create-value value-field="newEntity"/>
-        <field-to-result field="newEntity.contentPurposeTypeId" result-name="contentPurposeTypeId"/>
-    </simple-method>
-    <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType">
-        <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentPurposeType" short-description="Remove Content PurposeType">
-        <make-value entity-name="ContentPurposeType" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentPurposeType" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentAssocPredicate -->
-    <simple-method method-name="createContentAssocPredicate" short-description="Create Content AssocPredicate">
-        <make-value entity-name="ContentAssocPredicate" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <field-to-result field="newEntity.contentAssocPredicateId" result-name="contentAssocPredicateId"/>
-    </simple-method>
-    <simple-method method-name="updateContentAssocPredicate" short-description="Update Content AssocPredicate">
-        <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentAssocPredicate" short-description="Remove Content AssocPredicate">
-        <make-value entity-name="ContentAssocPredicate" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAssocPredicate" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentPurposeOperation -->
-    <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
-        <make-value entity-name="ContentPurposeOperation" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentPurposeOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentPurpose -->
-    <simple-method method-name="createContentPurpose" short-description="Create Content Purpose">
-        <make-value entity-name="ContentPurpose" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateContentPurpose" short-description="Update Content Purpose">
-        <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentPurpose" short-description="Remove Content Purpose">
-        <make-value entity-name="ContentPurpose" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentPurpose" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
     <simple-method method-name="updateSingleContentPurpose" short-description="Updates the purpose making sure there is only one">
         <set field="toRemove.contentId" from-field="parameters.contentId"/>
         <remove-by-and entity-name="ContentPurpose" map="toRemove"/>
         <call-simple-method method-name="createContentPurpose"/>
     </simple-method>
 
-    <!-- Methods for ContentOperation -->
-    <simple-method method-name="createContentOperation" short-description="Create Content Operation">
-        <make-value entity-name="ContentOperation" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateContentOperation" short-description="Update Content Operation">
-        <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentOperation" short-description="Remove Content Operation">
-        <make-value entity-name="ContentOperation" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentOperation" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Methods for ContentAttribute -->
-    <simple-method method-name="createContentAttribute" short-description="Create Content Attribute">
-        <make-value entity-name="ContentAttribute" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateContentAttribute" short-description="Update Content Attribute">
-        <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute">
-        <make-value entity-name="ContentAttribute" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- combined text + uploaded file service -->
     <simple-method method-name="createTextAndUploadedContent" short-description="Creates Text and Optionally Uploaded (sub) Content records">
         <set-service-fields service-name="createTextContent" map="parameters" to-map="textContext"/>
@@ -1228,25 +998,6 @@
         <field-to-result field="contentViewList" result-name="subSubContentList"/>
     </simple-method>
 
-    <!-- Content Keyword Services -->
-    <simple-method method-name="createContentKeyword" short-description="create a ContentKeyword">
-        <make-value entity-name="ContentKeyword" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    
-    <simple-method method-name="updateContentKeyword" short-description="update a ContentKeyword">
-        <entity-one entity-name="ContentKeyword" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    
-    <simple-method method-name="deleteContentKeyword" short-description="delete a ContentKeyword">
-        <entity-one entity-name="ContentKeyword" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-    
     <simple-method method-name="forceIndexContentKeywords" short-description="induce all the keywords of a content">
         <entity-one entity-name="Content" value-field="content"/>
         <call-class-method class-name="org.ofbiz.content.content.ContentKeywordIndex" method-name="forceIndexKeywords">

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1715960&r1=1715959&r2=1715960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Mon Nov 23 21:26:33 2015
@@ -250,27 +250,6 @@ under the License.
         <remove-value value-field="lookedUpValue"/>
     </simple-method>
 
-    <!-- Methods for DataResourceAttribute -->
-    <simple-method method-name="createDataResourceAttribute" short-description="Create Data Resource Attribute">
-        <make-value entity-name="DataResourceAttribute" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateDataResourceAttribute" short-description="Update Data Resource Attribute">
-        <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="DataResourceAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeDataResourceAttribute" short-description="Remove Data Resource Attribute">
-        <make-value entity-name="DataResourceAttribute" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="DataResourceAttribute" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- Methods for DataResourceTypeAttr -->
     <simple-method method-name="createDataResourceTypeAttr" short-description="Create Data Resource Type Attribute">
         <make-value entity-name="DataResourceTypeAttr" value-field="newEntity"/>

Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=1715960&r1=1715959&r2=1715960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Mon Nov 23 21:26:33 2015
@@ -101,142 +101,22 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <!-- ContentOperation services -->
-    <service name="createContentOperation" engine="simple" default-entity-name="ContentOperation" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentOperation">
-        <description>Create a ContentOperation</description>
-        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="INOUT" optional="true"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="updateContentOperation" engine="simple" default-entity-name="ContentOperation" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentOperation">
-        <description>Update a ContentOperation</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="removeContentOperation" engine="simple" default-entity-name="ContentOperation" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentOperation">
-        <description>Remove ContentOperation</description>
-        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-
-    <!-- ContentPurpose services -->
-    <service name="createContentPurpose" engine="simple" default-entity-name="ContentPurpose" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentPurpose">
-        <description>Create a ContentPurpose</description>
-        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="IN" optional="true"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="updateContentPurpose" engine="simple" default-entity-name="ContentPurpose" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentPurpose">
-        <description>Update a ContentPurpose</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="removeContentPurpose" engine="simple" default-entity-name="ContentPurpose" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentPurpose">
-        <description>Remove ContentPurpose</description>
-        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-    <service name="updateSingleContentPurpose" engine="simple" default-entity-name="ContentPurpose" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateSingleContentPurpose">
-        <description>Removes content purposes and creates a new one</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="true"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-
-    <!-- ContentPurposeOperation services -->
-    <service name="createContentPurposeOperation" engine="simple" default-entity-name="ContentPurposeOperation" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentPurposeOperation">
-        <description>Create a ContentPurposeOperation</description>
-        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="IN" optional="true"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="updateContentPurposeOperation" engine="simple" default-entity-name="ContentPurposeOperation" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentPurposeOperation">
-        <description>Update a ContentPurposeOperation</description>
-        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="removeContentPurposeOperation" engine="simple" default-entity-name="ContentPurposeOperation" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentPurposeOperation">
-        <description>Remove ContentPurposeOperation</description>
-        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-
-    <!-- ContentAttribute services -->
-    <service name="createContentAttribute" engine="simple" default-entity-name="ContentAttribute" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAttribute">
-        <description>Create a ContentAttribute</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="true"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="updateContentAttribute" engine="simple" default-entity-name="ContentAttribute" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentAttribute">
-        <description>Update a ContentAttribute</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="removeContentAttribute" engine="simple" default-entity-name="ContentAttribute" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAttribute">
-        <description>Remove ContentAttribute</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-
-    <!-- ContentMetaData services -->
-    <service name="createContentMetaData" engine="simple" default-entity-name="ContentMetaData" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentMetaData">
-        <description>Create a ContentMetaData</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="true"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="updateContentMetaData" engine="simple" default-entity-name="ContentMetaData" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentMetaData">
-        <description>Update a ContentMetaData</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-    <service name="removeContentMetaData" engine="simple" default-entity-name="ContentMetaData" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentMetaData">
-        <description>Remove ContentMetaData</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-
     <!-- DataResourceAttribute services -->
-    <service name="createDataResourceAttribute" engine="simple" default-entity-name="DataResourceAttribute" auth="true"
-            location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceAttribute">
+    <service name="createDataResourceAttribute" engine="entity-auto" default-entity-name="DataResourceAttribute" auth="true" invoke="create">
         <description>Create a DataResourceAttribute</description>
-        <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/>
+        <permission-service service-name="genericDataResourcePermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateDataResourceAttribute" engine="simple" default-entity-name="DataResourceAttribute" auth="true"
-            location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="updateDataResourceAttribute">
+    <service name="updateDataResourceAttribute" engine="entity-auto" default-entity-name="DataResourceAttribute" auth="true" invoke="update">
         <description>Update a DataResourceAttribute</description>
         <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeDataResourceAttribute" engine="simple" default-entity-name="DataResourceAttribute" auth="true"
-            location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceAttribute">
+    <service name="removeDataResourceAttribute" engine="entity-auto" default-entity-name="DataResourceAttribute" auth="true" invoke="delete">
         <description>Remove DataResourceAttribute</description>
-        <permission-service service-name="genericDataResourcePermission" main-action="UPDATE"/>
+        <permission-service service-name="genericDataResourcePermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
@@ -1135,51 +1015,6 @@
         <attribute name="dataResourceId" type="String" mode="IN" optional="true"/>
     </service>
 
-    <!-- Content Keyword Services -->
-    <service name="createContentKeyword" default-entity-name="ContentKeyword" engine="simple"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentKeyword" auth="true">
-        <description>Create a ContentKeyword</description>
-        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-
-    <service name="updateContentKeyword" default-entity-name="ContentKeyword" engine="simple"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentKeyword" auth="true">
-        <description>Update a ContentKeyword</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
-    </service>
-
-    <service name="deleteContentKeyword" default-entity-name="ContentKeyword" engine="simple"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deleteContentKeyword" auth="true">
-        <description>Delete a ContentKeyword</description>
-        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
-
-    <service name="deleteContentKeywords" engine="simple"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deleteContentKeywords" auth="true">
-        <description>Delete all the keywords of a content</description>
-        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
-        <attribute name="contentId" type="String" mode="IN" optional="false"/>
-    </service>
-
-    <service name="indexContentKeywords" engine="simple"
-                location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="indexContentKeywords" auth="false">
-        <description>Index the Keywords for a Content</description>
-        <attribute name="contentId" type="String" mode="IN" optional="false"/>
-        <attribute name="contentInstance" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/>
-    </service>
-
-    <service name="forceIndexContentKeywords" engine="simple"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="forceIndexContentKeywords" auth="true">
-        <description>Induce all the keywords of a content, ignoring the flag in the Content.</description>
-        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
-        <attribute name="contentId" type="String" mode="IN" optional="false"/>
-    </service>
-
     <service name="createContentAlternativeUrl" engine="simple"
             location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAlternativeUrl" auth="true" transaction-timeout="7200">
         <description>Create Content Alternative URL</description>

Modified: ofbiz/trunk/applications/content/servicedef/services_content.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_content.xml?rev=1715960&r1=1715959&r2=1715960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_content.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_content.xml Mon Nov 23 21:26:33 2015
@@ -286,18 +286,10 @@
         <attribute mode="INOUT" name="contentIdFrom" optional="true" type="String"/>
         <!-- end of deprecated fields -->
     </service>
-    <service name="removeContentAssoc" default-entity-name="ContentAssoc" engine="simple" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAssoc">
+    <service name="removeContentAssoc" default-entity-name="ContentAssoc" engine="entity-auto" auth="true" invoke="delete">
         <description>Remove ContentAssoc</description>
         <permission-service service-name="genericContentPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <!-- deprecated fields to be removed -->
-        <attribute mode="IN" name="targetOperationList" optional="true" type="List"/>
-        <attribute mode="IN" name="contentPurposeList" optional="true" type="List"/>
-        <attribute mode="IN" name="skipPermissionCheck" optional="true" type="String"/>
-        <attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/>
-        <attribute mode="INOUT" name="contentIdFrom" optional="true" type="String"/>
-        <!-- end of deprecated fields -->
     </service>
 
     <!-- content status services -->
@@ -314,13 +306,12 @@
     <service name="createContentRole" engine="simple" default-entity-name="ContentRole" auth="true"
             location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentRole">
         <description>Create a ContentRole</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
+        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateContentRole" engine="simple" default-entity-name="ContentRole" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentRole">
+    <service name="updateContentRole" engine="entity-auto" default-entity-name="ContentRole" auth="true" invoke="update">
         <description>Update a ContentRole</description>
         <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -334,10 +325,9 @@
         <attribute mode="IN" name="roleTypeId" optional="false" type="String"/>
         <attribute mode="IN" name="partyId" optional="false" type="String"/>
     </service>
-    <service name="removeContentRole" engine="simple"  default-entity-name="ContentRole" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentRole">
+    <service name="removeContentRole" engine="entity-auto" default-entity-name="ContentRole" auth="true" invoke="delete">
         <description>Remove ContentRole</description>
-        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
+        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
         <auto-attributes entity-name="ContentRole" include="pk" mode="IN" optional="false"/>
     </service>
 
@@ -350,4 +340,146 @@
         <attribute name="contentsNotUpdated" mode="OUT" type="Integer" optional="true"/>
         <attribute name="contentsUpdated" mode="OUT" type="Integer" optional="true"/>
     </service>
+
+    <!-- ContentMetaData services -->
+    <service name="createContentMetaData" engine="entity-auto" default-entity-name="ContentMetaData" auth="true" invoke="create">
+        <description>Create a ContentMetaData</description>
+        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateContentMetaData" engine="entity-auto" default-entity-name="ContentMetaData" auth="true" invoke="update">
+        <description>Update a ContentMetaData</description>
+        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeContentMetaData" engine="entity-auto" default-entity-name="ContentMetaData" auth="true" invoke="delete">
+        <description>Remove ContentMetaData</description>
+        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- ContentOperation services -->
+    <service name="createContentOperation" engine="entity-auto" default-entity-name="ContentOperation" auth="true" invoke="create">
+        <description>Create a ContentOperation</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateContentOperation" engine="entity-auto" default-entity-name="ContentOperation" auth="true" invoke="update">
+        <description>Update a ContentOperation</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeContentOperation" engine="entity-auto" default-entity-name="ContentOperation" auth="true" invoke="delete">
+        <description>Remove ContentOperation</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- ContentPurpose services -->
+    <service name="createContentPurpose" engine="entity-auto" default-entity-name="ContentPurpose" auth="true" invoke="create">
+        <description>Create a ContentPurpose</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateContentPurpose" engine="entity-auto" default-entity-name="ContentPurpose" auth="true" invoke="update">
+        <description>Update a ContentPurpose</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeContentPurpose" engine="entity-auto" default-entity-name="ContentPurpose" auth="true"
+            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="delete">
+        <description>Remove ContentPurpose</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="updateSingleContentPurpose" engine="simple" default-entity-name="ContentPurpose" auth="true"
+            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateSingleContentPurpose">
+        <description>Removes content purposes and creates a new one</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+
+    <!-- ContentPurposeOperation services -->
+    <service name="createContentPurposeOperation" engine="entity-auto" default-entity-name="ContentPurposeOperation" auth="true" invoke="create">
+        <description>Create a ContentPurposeOperation</description>
+        <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateContentPurposeOperation" engine="entity-auto" default-entity-name="ContentPurposeOperation" auth="true" invoke="update">
+        <description>Update a ContentPurposeOperation</description>
+        <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeContentPurposeOperation" engine="entity-auto" default-entity-name="ContentPurposeOperation" auth="true" invoke="delete">
+        <description>Remove ContentPurposeOperation</description>
+        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- ContentAttribute services -->
+    <service name="createContentAttribute" engine="entity-auto" default-entity-name="ContentAttribute" auth="true" invoke="create">
+        <description>Create a ContentAttribute</description>
+        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="true"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateContentAttribute" engine="entity-auto" default-entity-name="ContentAttribute" auth="true" invoke="update">
+        <description>Update a ContentAttribute</description>
+        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="removeContentAttribute" engine="entity-auto" default-entity-name="ContentAttribute" auth="true" invoke="delete">
+        <description>Remove ContentAttribute</description>
+        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <!-- Content Keyword Services -->
+    <service name="createContentKeyword" engine="entity-auto" default-entity-name="ContentKeyword" invoke="create" auth="true">
+        <description>Create a ContentKeyword</description>
+        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="updateContentKeyword" engine="entity-auto" default-entity-name="ContentKeyword" invoke="update" auth="true">
+        <description>Update a ContentKeyword</description>
+        <permission-service service-name="genericContentPermission" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <service name="deleteContentKeyword" engine="entity-auto" default-entity-name="ContentKeyword"
+            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="delete" auth="true">
+        <description>Delete a ContentKeyword</description>
+        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="deleteContentKeywords" engine="simple"
+            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deleteContentKeywords" auth="true">
+        <description>Delete all the keywords of a content</description>
+        <permission-service service-name="genericContentPermission" main-action="DELETE"/>
+        <attribute name="contentId" type="String" mode="IN" optional="false"/>
+    </service>
+    <service name="indexContentKeywords" engine="simple"
+                location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="indexContentKeywords" auth="false">
+        <description>Index the Keywords for a Content</description>
+        <attribute name="contentId" type="String" mode="IN" optional="false"/>
+        <attribute name="contentInstance" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/>
+    </service>
+    <service name="forceIndexContentKeywords" engine="simple"
+            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="forceIndexContentKeywords" auth="true">
+        <description>Induce all the keywords of a content, ignoring the flag in the Content.</description>
+        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <attribute name="contentId" type="String" mode="IN" optional="false"/>
+    </service>
+
 </services>

Modified: ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml?rev=1715960&r1=1715959&r2=1715960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml Mon Nov 23 21:26:33 2015
@@ -24,103 +24,89 @@ under the License.
     <vendor>OFBiz</vendor>
 
     <!-- ContentType services -->
-    <service name="createContentType" engine="simple" default-entity-name="ContentType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentType">
+    <service name="createContentType" engine="entity-auto" default-entity-name="ContentType" auth="true" invoke="create">
         <description>Create a ContentType</description>
         <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateContentType" engine="simple" default-entity-name="ContentType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentType">
+    <service name="updateContentType" engine="entity-auto" default-entity-name="ContentType" auth="true" invoke="update">
         <description>Update a ContentType</description>
         <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeContentType" engine="simple" default-entity-name="ContentType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentType" >
+    <service name="removeContentType" engine="entity-auto" default-entity-name="ContentType" auth="true" invoke="delete" >
         <description>Remove ContentType</description>
         <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- ContentAssocType services -->
-    <service name="createContentAssocType" engine="simple" default-entity-name="ContentAssocType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAssocType">
+    <service name="createContentAssocType" engine="entity-auto" default-entity-name="ContentAssocType" auth="true" invoke="create">
         <description>Create a ContentAssocType</description>
         <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateContentAssocType" engine="simple" default-entity-name="ContentAssocType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentAssocType">
+    <service name="updateContentAssocType" engine="entity-auto" default-entity-name="ContentAssocType" auth="true" invoke="update">
         <description>Update a ContentAssocType</description>
         <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeContentAssocType" engine="simple" default-entity-name="ContentAssocType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAssocType">
+    <service name="removeContentAssocType" engine="entity-auto" default-entity-name="ContentAssocType" auth="true" invoke="delete">
         <description>Remove ContentAssocType</description>
         <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- ContentTypeAttr services -->
-    <service name="createContentTypeAttr" engine="simple" default-entity-name="ContentTypeAttr" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentTypeAttr">
+    <service name="createContentTypeAttr" engine="entity-auto" default-entity-name="ContentTypeAttr" auth="true" invoke="create">
         <description>Create a ContentTypeAttr</description>
         <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeContentTypeAttr" engine="simple" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentTypeAttr">
+    <service name="removeContentTypeAttr" engine="entity-auto" auth="true" invoke="delete">
         <description>Remove ContentTypeAttr</description>
         <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
         <auto-attributes entity-name="ContentTypeAttr" include="pk" mode="IN" optional="false"/>
     </service>
 
     <!--ContentAssocPredicate services.-->
-    <service name="createContentAssocPredicate" engine="simple" default-entity-name="ContentAssocPredicate" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAssocPredicate">
+    <service name="createContentAssocPredicate" engine="entity-auto" default-entity-name="ContentAssocPredicate" auth="true" invoke="create">
         <description>Create a ContentAssocPredicate</description>
         <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateContentAssocPredicate" engine="simple" default-entity-name="ContentAssocPredicate" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentAssocPredicate">
+    <service name="updateContentAssocPredicate" engine="entity-auto" default-entity-name="ContentAssocPredicate" auth="true" invoke="update">
         <description>Update a ContentAssocPredicate</description>
         <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeContentAssocPredicate" engine="simple" default-entity-name="ContentAssocPredicate" auth="true"
-        location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAssocPredicate">
+    <service name="removeContentAssocPredicate" engine="entity-auto" default-entity-name="ContentAssocPredicate" auth="true" invoke="delete">
         <description>Remove ContentAssocPredicate</description>
         <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
         <auto-attributes entity-name="ContentAssocPredicate" include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- ContentPurposeType services -->
-    <service name="createContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentPurposeType">
+    <service name="createContentPurposeType" engine="entity-auto" default-entity-name="ContentPurposeType" auth="true" invoke="create">
         <description>Create a ContentPurposeType</description>
         <permission-service service-name="contentManagerPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentPurposeType">
+    <service name="updateContentPurposeType" engine="entity-auto" default-entity-name="ContentPurposeType" auth="true" invoke="update">
         <description>Update a ContentPurposeType</description>
         <permission-service service-name="contentManagerPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" auth="true"
-            location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="removeContentPurposeType">
+    <service name="removeContentPurposeType" engine="entity-auto" default-entity-name="ContentPurposeType" auth="true" invoke="delete">
         <description>Remove ContentPurposeType</description>
         <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>