svn commit: r1767549 - in /ofbiz/trunk/applications/workeffort: minilang/workeffort/WorkEffortSimpleServices.xml servicedef/services.xml

[Deepak Dixit-5]

Author: deepak
Date: Tue Nov  1 19:11:20 2016
New Revision: 1767549

URL: http://svn.apache.org/viewvc?rev=1767549&view=rev
Log:
Improved: Converted following WorkEffort related services to entity-auto
 - CustRequestItemWorkEffort
 - CustRequestWorkEffort
 - OrderHeaderWorkEffort
 - WorkEffortContactMech
 - QuoteWorkEffort
 - ShoppingListWorkEffort
 - WorkEffortContent
 - WorkEffortGoodStandard
 - WorkRequirementFulfillment
 (OFBIZ-8658)(OFBIZ-8659)(OFBIZ-8660)(OFBIZ-8661)(OFBIZ-8663)(OFBIZ-8665)(OFBIZ-8666)(OFBIZ-8667)(OFBIZ-8668)
 
Thanks Pawan Verma for your contribution.

Modified:
    ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
    ofbiz/trunk/applications/workeffort/servicedef/services.xml

Modified: ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1767549&r1=1767548&r2=1767549&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Tue Nov  1 19:11:20 2016
@@ -476,18 +476,6 @@ under the License.
         <field-to-request field="newWorkEffortContactMech.contactMechId" request-name="contactMechId"/>
     </simple-method>
 
-    <simple-method method-name="deleteWorkEffortContactMech" short-description="Delete a WorkEffortContactMech">
-        <!-- Find old value -->
-        <entity-one entity-name="WorkEffortContactMech" value-field="workEffortContactMech"/>
-        <if-empty field="workEffortContactMech">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCannotDeleteContactInfo"/>
-            </add-error>
-        </if-empty>
-        <check-errors/>
-        <remove-value value-field="workEffortContactMech"/>
-    </simple-method>
-
     <simple-method method-name="createWorkEffortPostalAddress" short-description="Create a PostalAddress for WorkEffort">
         <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
         <log level="info" message="Creating postal address"/>
@@ -764,24 +752,6 @@ under the License.
         </iterate>
     </simple-method>
 
-    <simple-method method-name="createWorkEffortGoodStandard" short-description="Create a link between a WorkEffort and a Product">
-        <entity-one entity-name="WorkEffortGoodStandard" value-field="lookedUpValue"/>
-        <if-not-empty field="lookedUpValue">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortGoodStandardAlreadyExist"/>
-            </add-error>
-            <check-errors/>
-        <else>
-            <make-value value-field="newEntity" entity-name="WorkEffortGoodStandard"/>
-            <set-pk-fields map="parameters" value-field="newEntity"/>
-            <if-empty field="newEntity.fromDate">
-                <now-timestamp field="newEntity.fromDate"/>
-            </if-empty>
-            <set-nonpk-fields map="parameters" value-field="newEntity"/>
-            <create-value value-field="newEntity"/>
-        </else>
-        </if-not-empty>
-    </simple-method>
     <simple-method method-name="assignInventoryToWorkEffort" short-description="Create or update WorkEffortInventoryAssign">
         <set value="Create or update WorkEffortInventoryAssign" field="operationName"/>
 
@@ -801,56 +771,7 @@ under the License.
         </if-not-empty>
     </simple-method>
 
-    <!-- CustRequest workeffort -->
-    <simple-method method-name="createWorkEffortRequest" short-description="Create a CustRequestWorkEffort">
-        <make-value entity-name="CustRequestWorkEffort" value-field="lookupMap"/>
-        <set-pk-fields map="parameters" value-field="lookupMap"/>
-        <find-by-primary-key entity-name="CustRequestWorkEffort" map="lookupMap" value-field="custRequestWorkEffort"/>
-        <if-not-empty field="custRequestWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestAlreadyExists"/>
-            </add-error>
-            <check-errors/>
-        </if-not-empty>
-        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
-        <create-value value-field="lookupMap"/>
-        <field-to-result field="custRequestId" result-name="lookupMap"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
-        <entity-one entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/>
-        <if-empty field="custRequestWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestDoesNotExists"/>
-            </add-error>
-            <check-errors/>
-        </if-empty>
-        <remove-value value-field="custRequestWorkEffort"/>
-    </simple-method>
-
     <!-- CustRequestItem workeffort -->
-    <simple-method method-name="createWorkEffortRequestItem" short-description="Create a CustRequestItemWorkEffort">
-        <make-value entity-name="CustRequestItemWorkEffort" value-field="lookupMap"/>
-        <set-pk-fields map="parameters" value-field="lookupMap"/>
-        <find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap" value-field="custRequestItemWorkEffort"/>
-        <if-not-empty field="custRequestItemWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestItemAlreadyExists"/>
-            </add-error>
-            <check-errors/>
-        </if-not-empty>
-        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
-        <create-value value-field="lookupMap"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkEffortRequestItem" short-description="Delete a CustRequestItemWorkEffort">
-        <entity-one entity-name="CustRequestItemWorkEffort" value-field="custRequestItemWorkEffort"/>
-        <if-empty field="custRequestItemWorkEffort.custRequestItemSeqId">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortCustRequestItemDoesNotExists"/>
-            </add-error>
-            <check-errors/>
-        </if-empty>
-        <remove-value value-field="custRequestItemWorkEffort"/>
-    </simple-method>
     <simple-method method-name="checkCustRequestItemExists" short-description="Checks to see if a CustRequestItem exists">
         <make-value entity-name="CustRequestItem" value-field="lookupMap"/>
         <set-pk-fields map="parameters" value-field="lookupMap"/>
@@ -865,110 +786,6 @@ under the License.
         </if-not-empty>
     </simple-method>
 
-    <!--Quote workeffort -->
-    <simple-method method-name="createWorkEffortQuote" short-description="Create a QuoteWorkEffort">
-        <make-value entity-name="QuoteWorkEffort" value-field="lookupMap"/>
-        <set-pk-fields map="parameters" value-field="lookupMap"/>
-        <find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap" value-field="quoteWorkEffort"/>
-        <if-not-empty field="quoteWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortQuoteAlreadyExists"/>
-            </add-error>
-            <check-errors/>
-        </if-not-empty>
-        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
-        <create-value value-field="lookupMap"/>
-        <field-to-result field="quoteId" result-name="lookupMap"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
-        <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/>
-        <if-empty field="quoteWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortQuoteDoesNotExists"/>
-            </add-error>
-            <check-errors/>
-        </if-empty>
-        <remove-value value-field="quoteWorkEffort"/>
-    </simple-method>
-
-    <!--Requirement workeffort -->
-    <simple-method method-name="createWorkRequirementFulfillment" short-description="Create a WorkRequirementFulfillment">
-        <make-value entity-name="WorkRequirementFulfillment" value-field="lookupMap"/>
-        <set-pk-fields map="parameters" value-field="lookupMap"/>
-        <find-by-primary-key entity-name="WorkRequirementFulfillment" map="lookupMap" value-field="workRequirementFulfillment"/>
-        <if-not-empty field="workRequirementFulfillment">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequirementFulfillmentAlreadyExists"/>
-            </add-error>
-            <check-errors/>
-        </if-not-empty>
-        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
-        <create-value value-field="lookupMap"/>
-        <field-to-result field="requirementId" result-name="lookupMap"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
-        <entity-one entity-name="WorkRequirementFulfillment" value-field="workRequirementFulfillment"/>
-        <if-empty field="workRequirementFulfillment">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequirementFulfillmentDoesNotExists"/>
-            </add-error>
-            <check-errors/>
-        </if-empty>
-        <remove-value value-field="workRequirementFulfillment"/>
-    </simple-method>
-
-    <!--ShoppingList workeffort -->
-    <simple-method method-name="createShoppingListWorkEffort" short-description="Create a ShoppingListWorkEffort">
-        <make-value entity-name="ShoppingListWorkEffort" value-field="lookupMap"/>
-        <set-pk-fields map="parameters" value-field="lookupMap"/>
-        <find-by-primary-key entity-name="ShoppingListWorkEffort" map="lookupMap" value-field="shoppingListWorkEffort"/>
-        <if-not-empty field="shoppingListWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortShoppingListAlreadyExists"/>
-            </add-error>
-            <check-errors/>
-        </if-not-empty>
-        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
-        <create-value value-field="lookupMap"/>
-        <field-to-result field="shoppingListId" result-name="lookupMap"/>
-    </simple-method>
-    <simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
-        <entity-one entity-name="ShoppingListWorkEffort" value-field="shoppingListWorkEffort"/>
-        <if-empty field="shoppingListWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortShoppingListDoesNotExists"/>
-            </add-error>
-            <check-errors/>
-        </if-empty>
-        <remove-value value-field="shoppingListWorkEffort"/>
-    </simple-method>
-
-    <!--OrderHeader workeffort -->
-    <simple-method method-name="createOrderHeaderWorkEffort" short-description="Create a OrderHeaderWorkEffort">
-        <make-value entity-name="OrderHeaderWorkEffort" value-field="lookupMap"/>
-        <set-pk-fields map="parameters" value-field="lookupMap"/>
-        <find-by-primary-key entity-name="OrderHeaderWorkEffort" map="lookupMap" value-field="orderWorkEffort"/>
-        <if-not-empty field="orderWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortOrderHeaderAlreadyExists"/>
-            </add-error>
-            <check-errors/>
-        </if-not-empty>
-        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
-        <create-value value-field="lookupMap"/>
-        <field-to-result field="orderId" result-name="lookupMap"/>
-    </simple-method>
-    <simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
-        <entity-one entity-name="OrderHeaderWorkEffort" value-field="orderWorkEffort"/>
-        <if-empty field="orderWorkEffort">
-            <add-error>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortOrderHeaderDoesNotExists"/>
-            </add-error>
-            <check-errors/>
-        </if-empty>
-        <remove-value value-field="orderWorkEffort"/>
-    </simple-method>
-
     <simple-method method-name="setWorkEffortFixedAssetAssign" short-description="Based on task's estimate dates, write assign entries for the fixed asset the task is assigned to">
         <entity-one entity-name="WorkEffort" value-field="workEffort"/>
         <set from-field="workEffort.workEffortId" field="findMap.workEffortId"/>
@@ -1078,48 +895,6 @@ under the License.
         <remove-value value-field="lookedUpValue"/>
     </simple-method>
 
-    <!-- Create/Update/Delete Work Effort Content-->
-    <simple-method method-name="createWorkEffortContent" short-description="Create Work Effort Content">
-        <!-- need a better way to handle per workeffort permissions
-        <check-permission permission="WORKEFFORTMGR" action="_CREATE">
-            <fail-property resource="WorkEffortUiLabels" property="WorkEffortCreatePermissionError"/>
-        </check-permission>
-        <check-errors />
-        -->
-        <make-value entity-name="WorkEffortContent" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-
-        <if-empty field="newEntity.fromDate">
-            <now-timestamp field="nowTimestamp"/>
-            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
-        </if-empty>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateWorkEffortContent" short-description="Update Work Effort Content">
-        <!-- need a better way to handle permissions
-        <check-permission permission="WORKEFFORTMGR" action="_UPDATE">
-            <fail-property resource="WorkEffortUiLabels" property="WorkEffortUpdatePermissionError"/>
-        </check-permission>
-        <check-errors />
-        -->
-        <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteWorkEffortContent"
-            short-description="Remove a WorkEffort Content">
-        <!-- need a better way to handle per workeffort permissions
-        <check-permission permission="WORKEFFORTMGR" action="_DELETE">
-            <fail-property resource="WorkEffortUiLabels" property="WorkEffortDeletePermissionError"/>
-        </check-permission>
-        <check-errors />
-        -->
-        <entity-one entity-name="WorkEffortContent" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
     <!-- Create/Update/Delete Work Effort Review-->
     <simple-method method-name="createWorkEffortReview" short-description="Create Work Effort Review">
         <check-permission permission="WORKEFFORTMGR" action="_CREATE">

Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=1767549&r1=1767548&r2=1767549&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Tue Nov  1 19:11:20 2016
@@ -373,13 +373,12 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkEffortAssoc"/>
     </service>
 
-    <service name="createWorkEffortGoodStandard" engine="simple" default-entity-name="WorkEffortGoodStandard"
-            location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortGoodStandard">
+    <service name="createWorkEffortGoodStandard" engine="entity-auto" default-entity-name="WorkEffortGoodStandard" invoke="create">
         <description>
             Create a WorkEffort - Product Assoc, for linking WorkEffort to In or Out  Product,
             for routing it's the link between Manufactured Product with its routings
         </description>
-        <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
+        <permission-service service-name="workEffortGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
@@ -422,14 +421,14 @@ under the License.
         <description>Deletes CommunicationEventWorkEff</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="CommunicationEventWorkEff"/>
     </service>
-    <service name="createWorkEffortRequest" engine="simple" location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortRequest" auth="true">
+    <service name="createWorkEffortRequest" engine="entity-auto" default-entity-name="CustRequestWorkEffort" invoke="create" auth="true">
         <description>Creates a CustRequestWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequest"/>
         <override name="custRequestId" optional="true" mode="INOUT"/>
         <override name="description" allow-html="any"/>
     </service>
-    <service name="deleteWorkEffortRequest" engine="simple" location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequest" auth="true">
+    <service name="deleteWorkEffortRequest" engine="entity-auto" default-entity-name="CustRequestWorkEffort" invoke="delete" auth="true">
         <description>Deletes a CustRequestWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestWorkEffort"/>
     </service>
@@ -439,15 +438,13 @@ under the License.
         <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequestItem"/>
         <attribute name="custRequestItemExists" type="java.lang.String" mode="OUT" optional="true"/>
     </service>
-    <service name="createWorkEffortRequestItem" engine="simple"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortRequestItem" auth="true">
+    <service name="createWorkEffortRequestItem" engine="entity-auto" invoke="create" auth="true">
         <description>Creates a CustRequestItemWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="CustRequestItem"/>
         <attribute name="custRequestItemExists" type="java.lang.String" mode="IN" optional="true"/>
     </service>
-    <service name="deleteWorkEffortRequestItem" engine="simple"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortRequestItem" auth="true">
+    <service name="deleteWorkEffortRequestItem" engine="entity-auto" invoke="delete" auth="true">
         <description>Deletes a CustRequestItemWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="CustRequestItemWorkEffort"/>
     </service>
@@ -457,53 +454,48 @@ under the License.
         <attribute name="custRequestItemExists" type="java.lang.String" mode="OUT" optional="true"/>
     </service>
 
-    <service name="createWorkEffortQuote" engine="simple" location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortQuote" auth="true">
+    <service name="createWorkEffortQuote" engine="entity-auto" default-entity-name="QuoteWorkEffort" invoke="create" auth="true">
         <description>Creates a QuoteWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="QuoteWorkEffort"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="Quote"/>
         <override name="quoteId" optional="true" mode="INOUT"/>
     </service>
-    <service name="deleteWorkEffortQuote" default-entity-name="QuoteWorkEffort" engine="simple" auth="true"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortQuote">
+    <service name="deleteWorkEffortQuote" default-entity-name="QuoteWorkEffort" engine="entity-auto" auth="true" invoke="delete">
         <description>Deletes a QuoteWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createWorkRequirementFulfillment" engine="simple" auth="true"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkRequirementFulfillment">
+    <service name="createWorkRequirementFulfillment" engine="entity-auto" default-entity-name="WorkRequirementFulfillment" auth="true" invoke="create">
         <description>Creates a WorkRequirementFulfillment</description>
         <auto-attributes include="pk" mode="IN" optional="true" entity-name="WorkRequirementFulfillment"/>
         <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="WorkRequirementFulfillment"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="Requirement"/>
     </service>
-    <service name="deleteWorkRequirementFulfillment" engine="simple" auth="true"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkRequirementFulfillment">
+    <service name="deleteWorkRequirementFulfillment" engine="entity-auto" default-entity-name="WorkRequirementFulfillment" auth="true" invoke="delete">
         <description>Deletes a WorkRequirementFulfillment</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="WorkRequirementFulfillment"/>
     </service>
 
-    <service name="createShoppingListWorkEffort" engine="simple" location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createShoppingListWorkEffort" auth="true">
+    <service name="createShoppingListWorkEffort" engine="entity-auto" default-entity-name="ShoppingListWorkEffort" invoke="create" auth="true">
         <description>Creates a ShoppingListWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="ShoppingListWorkEffort"/>
         <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="ShoppingListWorkEffort"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="ShoppingList"/>
         <override name="shoppingListId" optional="true" mode="INOUT"/>
     </service>
-    <service name="deleteShoppingListWorkEffort" engine="simple" location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteShoppingListWorkEffort" auth="true">
+    <service name="deleteShoppingListWorkEffort" engine="entity-auto" default-entity-name="ShoppingListWorkEffort" invoke="delete" auth="true">
         <description>Deletes a ShoppingListWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="ShoppingListWorkEffort"/>
     </service>
 
-    <service name="createOrderHeaderWorkEffort" engine="simple" auth="true"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createOrderHeaderWorkEffort">
+    <service name="createOrderHeaderWorkEffort" engine="entity-auto" default-entity-name="OrderHeaderWorkEffort" auth="true" invoke="create">
         <description>Creates a OrderHeaderWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false" entity-name="OrderHeaderWorkEffort"/>
         <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="OrderHeaderWorkEffort"/>
         <auto-attributes include="all" mode="IN" optional="true" entity-name="OrderHeader"/>
         <override name="orderId" optional="true" mode="INOUT"/>
     </service>
-    <service name="deleteOrderHeaderWorkEffort" default-entity-name="OrderHeaderWorkEffort" engine="simple" auth="true"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteOrderHeaderWorkEffort">
+    <service name="deleteOrderHeaderWorkEffort" default-entity-name="OrderHeaderWorkEffort" engine="entity-auto" auth="true" invoke="deleteOrderHeaderWorkEffort">
         <description>Deletes a OrderHeaderWorkEffort</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
@@ -566,29 +558,20 @@ under the License.
     </service>
 
     <!-- work effort content services -->
-    <service name="createWorkEffortContent" engine="simple"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
-        invoke="createWorkEffortContent"
-        default-entity-name="WorkEffortContent" auth="true">
+    <service name="createWorkEffortContent" engine="entity-auto" invoke="create" default-entity-name="WorkEffortContent" auth="true">
         <description>Create a Work Effort Content</description>
-        <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
+        <permission-service service-name="workEffortGenericPermission" 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="updateWorkEffortContent" engine="simple"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
-        invoke="updateWorkEffortContent"
-        default-entity-name="WorkEffortContent" auth="true">
+    <service name="updateWorkEffortContent" engine="entity-auto" invoke="update" default-entity-name="WorkEffortContent" auth="true">
         <description>Update a Work Effort Content</description>
         <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteWorkEffortContent" engine="simple"
-        location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
-        invoke="deleteWorkEffortContent"
-        default-entity-name="WorkEffortContent" auth="true">
+    <service name="deleteWorkEffortContent" engine="entity-auto" invoke="delete" default-entity-name="WorkEffortContent" auth="true">
         <description>Delete a Work Effort Content</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -731,8 +714,7 @@ under the License.
         <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="true"/>
     </service>
-    <service name="deleteWorkEffortContactMech" engine="simple" default-entity-name="WorkEffortContactMech"
-            location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffortContactMech" auth="true">
+    <service name="deleteWorkEffortContactMech" engine="entity-auto" default-entity-name="WorkEffortContactMech" invoke="delete" auth="true">
         <description>Delete WorkEffortContactMech</description>
         <permission-service service-name="workEffortGenericPermission" main-action="DELETE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>