You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2016/02/03 08:27:21 UTC

svn commit: r1728261 [2/3] - in /ofbiz/trunk/applications/product: script/org/ofbiz/product/category/ script/org/ofbiz/product/communication/ script/org/ofbiz/product/config/ script/org/ofbiz/product/inventory/ script/org/ofbiz/product/price/ script/or...

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Wed Feb  3 07:27:21 2016
@@ -20,42 +20,6 @@ under the License.
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
-    <!-- Facility Services -->
-    <simple-method method-name="createFacility" short-description="Create a Facility">
-        <make-value value-field="newEntity" entity-name="Facility"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <sequenced-id sequence-name="Facility" field="facilityId"/>
-        <to-string field="facilityId"/>
-        <set field="newEntity.facilityId" from-field="facilityId"/>
-        <field-to-result field="facilityId" result-name="facilityId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateFacility" short-description="Update a Facility">
-        <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
-        <find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
-        <set-nonpk-fields map="parameters" value-field="facility"/>
-        <store-value value-field="facility"/>
-    </simple-method>
-    <simple-method method-name="deleteFacility" short-description="Delete a Facility">
-        <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
-        <find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
-        <remove-value value-field="facility"/>
-    </simple-method>
-
-    <!-- Facility ContactMech Services -->
-    <simple-method method-name="addContactMechToFacility" short-description="Add ContactMech To Facility">
-        <make-value value-field="newEntity" entity-name="FacilityContactMech"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="removeContactMechFromFacility" short-description="Remove ContactMech From Facility">
-        <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
-        <set field="lookupPKMap.contactMechId" from-field="parameters.contactMechId"/>
-        <find-by-primary-key entity-name="FacilityContactMech" map="lookupPKMap" value-field="facilityContactMech"/>
-        <remove-value value-field="facilityContactMech"/>
-    </simple-method>
 
     <!-- Facility Location Services -->
     <simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
@@ -89,124 +53,8 @@ under the License.
 
         <create-value value-field="newEntity"/>
     </simple-method>
-    <simple-method method-name="updateFacilityLocation" short-description="Update a Facility Location">
-        <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
-        <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId"/>
-        <find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
-        <set-nonpk-fields map="parameters" value-field="facilityLocation"/>
-        <store-value value-field="facilityLocation"/>
-    </simple-method>
-    <simple-method method-name="deleteFacilityLocation" short-description="Delete a Facility Location">
-        <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
-        <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId"/>
-        <find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
-        <remove-value value-field="facilityLocation"/>
-    </simple-method>
-
-    <!-- Facility Group Services -->
-    <simple-method method-name="createFacilityGroup" short-description="Create an Facility Group">
-        <make-value value-field="newEntity" entity-name="FacilityGroup"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <sequenced-id sequence-name="FacilityGroup" field="facilityGroupId"/>
-        <to-string field="facilityGroupId"/>
-        <set field="newEntity.facilityGroupId" from-field="facilityGroupId"/>
-        <field-to-result field="facilityGroupId" result-name="facilityGroupId"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateFacilityGroup" short-description="Update an Facility Group">
-        <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId"/>
-        <find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
-        <set-nonpk-fields map="parameters" value-field="facilityGroup"/>
-        <store-value value-field="facilityGroup"/>
-    </simple-method>
-    <simple-method method-name="deleteFacilityGroup" short-description="Delete an Facility Group">
-        <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId"/>
-        <find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
-        <remove-value value-field="facilityGroup"/>
-    </simple-method>
-
-    <!-- Facility Member Services -->
-    <simple-method method-name="addFacilityToGroup" short-description="Add Facility to FacilityGroup">
-        <make-value value-field="newEntity" entity-name="FacilityGroupMember"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-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="updateFacilityToGroup" short-description="Update Facility to FacilityGroup Application">
-        <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup">
-        <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupMember" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Facility Group Rollup Services -->
-    <simple-method method-name="addFacilityGroupToGroup" short-description="Add FacilityGroup to FacilityGroup">
-        <make-value value-field="newEntity" entity-name="FacilityGroupRollup"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-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="updateFacilityGroupToGroup" short-description="Update FacilityGroup to FacilityGroup Rollup">
-        <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup">
-        <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupRollup" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <!-- Facility Role / Facility Group Role Services -->
-    <simple-method method-name="addPartyToFacility" short-description="Add Party to Facility">
-        <set from-field="parameters.partyId" field="lookupPKMap.partyId"/>
-        <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
-        <find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="partyRole"/>
-        <if-empty field="partyRole">
-            <make-value value-field="partyRole" entity-name="PartyRole"/>
-            <set-pk-fields map="lookupPKMap" value-field="partyRole"/>
-            <create-value value-field="partyRole"/>
-        </if-empty>
-        <make-value value-field="newEntity" entity-name="FacilityParty"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-             <if-empty field="newEntity.fromDate">
-                 <now-timestamp field="newEntity.fromDate"/>
-             </if-empty>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
-    <simple-method method-name="addPartyToFacilityGroup" short-description="Add Party to FacilityGroup">
-        <make-value value-field="newEntity" entity-name="FacilityGroupRole"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
 
+    <!-- Facility Role Services -->
     <simple-method method-name="removePartyFromFacility" short-description="Remove Party From Facility">
         <entity-one entity-name="FacilityParty" value-field="lookedUpValue"/>
         <now-timestamp field="thruDate"/>
@@ -221,16 +69,6 @@ under the License.
         <remove-value value-field="lookedUpValue"/>
     </simple-method>
 
-    <simple-method method-name="createFacilityContent" short-description="Create Facility Content"> 
-        <make-value entity-name="FacilityContent" 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="newEntity.fromDate"/>
-        </if-empty>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
     <simple-method method-name="deleteFacilityContent" short-description="Delete Content From Facility">
         <make-value value-field="lookupPKMap" entity-name="FacilityContent"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Wed Feb  3 07:27:21 2016
@@ -25,7 +25,7 @@ under the License.
             <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
         </check-permission>
         <check-errors/>
-        
+
         <if-compare field="parameters.oneInventoryFacility" operator="equals" value="Y">
             <if-empty field="parameters.inventoryFacilityId">
                 <add-error>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml Wed Feb  3 07:27:21 2016
@@ -20,78 +20,7 @@ under the License.
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
-    <simple-method method-name="createSupplierProduct" short-description="Create a Supplier Product record">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-errors/>
 
-        <make-value value-field="newEntity" entity-name="SupplierProduct"/>
-        <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="updateSupplierProduct" short-description="Update a Supplier Product record">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-
-        <find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>
-        <set-nonpk-fields map="parameters" value-field="sprod"/>
-        <store-value value-field="sprod"/>
-    </simple-method>
-
-    <simple-method method-name="removeSupplierProduct" short-description="Remove a Supplier Product record">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="lookupPKMap" entity-name="SupplierProduct"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-
-        <find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>
-        <remove-value value-field="sprod"/>
-    </simple-method>
-
-    <!-- services for supplier product features -->
-    <simple-method method-name="createSupplierProductFeature" short-description="Create a Supplier Product Feature record">
-        <check-permission permission="CATALOG" action="_CREATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="SupplierProductFeature"/>
-        <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="updateSupplierProductFeature" short-description="Update a Supplier Product Feature record">
-        <check-permission permission="CATALOG" action="_UPDATE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="SupplierProductFeature" value-field="sprod"/>
-        <set-nonpk-fields map="parameters" value-field="sprod"/>
-        <store-value value-field="sprod"/>
-    </simple-method>
-    <simple-method method-name="removeSupplierProductFeature" short-description="Remove a Supplier Product record">
-        <check-permission permission="CATALOG" action="_DELETE">
-            <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/>
-        </check-permission>
-        <check-errors/>
-
-        <entity-one entity-name="SupplierProductFeature" value-field="sprod"/>
-        <remove-value value-field="sprod"/>
-    </simple-method>
     <simple-method method-name="getSupplierProductFeatures" short-description="Get all supplier information for a product feature" login-required="false">
         <entity-and entity-name="SupplierProductFeature" list="supplierProductFeatures">
             <field-map field-name="partyId" from-field="parameters.partyId"/>

Modified: ofbiz/trunk/applications/product/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/secas.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/secas.xml Wed Feb  3 07:27:21 2016
@@ -117,7 +117,7 @@ under the License.
         <condition field-name="orderIdList" operator="is-not-empty"/>
         <action service="convertPickOrderIdListToHeaders" mode="sync"/>
     </eca>
-    
+
     <eca service="receiveInventoryProduct" event="commit">
         <condition field-name="facilityId" operator="is-not-empty"/>
         <condition field-name="orderId" operator="is-not-empty"/>
@@ -128,7 +128,7 @@ under the License.
     <eca service="receiveInventoryProduct" event="commit">
         <action service="updateProductAverageCostOnReceiveInventory" mode="sync"/>
     </eca>
-    
+
     <!-- Remove party content of image  -->
     <eca service="deletePartyRole" event="commit">
         <condition field-name="roleTypeId" operator="equals" value="IMAGEAPPROVER"/>

Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Wed Feb  3 07:27:21 2016
@@ -289,27 +289,26 @@ under the License.
     <service name="saveProductPriceChange" default-entity-name="ProductPrice" engine="simple"
             location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="saveProductPriceChange" auth="true">
         <description>Save History of a ProductPrice Change</description>
+        <permission-service service-name="productPriceGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="oldPrice" type="BigDecimal" mode="IN" optional="true"/>
+        <override name="productPriceChangeId" mode="OUT"/>
     </service>
 
     <!-- Product PaymentMethodType Services -->
-    <service name="createProductPaymentMethodType" default-entity-name="ProductPaymentMethodType" engine="simple"
-            location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="createProductPaymentMethodType" auth="true">
+    <service name="createProductPaymentMethodType" default-entity-name="ProductPaymentMethodType" engine="entity-auto" invoke="create" auth="true">
         <description>Create an ProductPaymentMethodType</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateProductPaymentMethodType" default-entity-name="ProductPaymentMethodType" engine="simple"
-            location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="updateProductPaymentMethodType" auth="true">
+    <service name="updateProductPaymentMethodType" default-entity-name="ProductPaymentMethodType" engine="entity-auto" invoke="update" auth="true">
         <description>Update an ProductPaymentMethodType</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductPaymentMethodType" default-entity-name="ProductPaymentMethodType" engine="simple"
-            location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="deleteProductPaymentMethodType" auth="true">
+    <service name="deleteProductPaymentMethodType" default-entity-name="ProductPaymentMethodType" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an ProductPaymentMethodType</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
@@ -481,8 +480,7 @@ under the License.
     </service>
 
     <!-- SupplierProduct Services -->
-    <service name="createSupplierProduct" default-entity-name="SupplierProduct" engine="simple"
-        location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="createSupplierProduct" auth="true">
+    <service name="createSupplierProduct" default-entity-name="SupplierProduct" engine="entity-auto" invoke="create" auth="true">
         <description>Create a new SupplierProduct record</description>
         <required-permissions join-type="AND">
             <check-permission permission="CATALOG" action="_CREATE"/>
@@ -492,8 +490,7 @@ under the License.
         <override name="supplierProductId" optional="false"/>
         <override name="lastPrice" optional="false"/>
     </service>
-    <service name="updateSupplierProduct" default-entity-name="SupplierProduct" engine="simple"
-        location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="updateSupplierProduct" auth="true">
+    <service name="updateSupplierProduct" default-entity-name="SupplierProduct" engine="entity-auto" invoke="update" auth="true">
         <description>Update a SupplierProduct record</description>
         <required-permissions join-type="AND">
             <check-permission permission="CATALOG" action="_UPDATE"/>
@@ -501,8 +498,7 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="removeSupplierProduct" default-entity-name="SupplierProduct" engine="simple"
-        location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="removeSupplierProduct" auth="true">
+    <service name="removeSupplierProduct" default-entity-name="SupplierProduct" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove a SupplierProduct record</description>
         <required-permissions join-type="AND">
             <check-permission permission="CATALOG" action="_DELETE"/>
@@ -511,8 +507,7 @@ under the License.
     </service>
 
     <!-- supplier product feature services -->
-    <service name="createSupplierProductFeature" default-entity-name="SupplierProductFeature" engine="simple"
-        location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="createSupplierProductFeature" auth="true">
+    <service name="createSupplierProductFeature" default-entity-name="SupplierProductFeature" engine="entity-auto" invoke="create" auth="true">
         <description>Create a new SupplierProductFeature record</description>
         <required-permissions join-type="AND">
             <check-permission permission="CATALOG" action="_CREATE"/>
@@ -520,8 +515,7 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="updateSupplierProductFeature" default-entity-name="SupplierProductFeature" engine="simple"
-        location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="updateSupplierProductFeature" auth="true">
+    <service name="updateSupplierProductFeature" default-entity-name="SupplierProductFeature" engine="entity-auto" invoke="update" auth="true">
         <description>Update a SupplierProduct record</description>
         <required-permissions join-type="AND">
             <check-permission permission="CATALOG" action="_UPDATE"/>
@@ -529,8 +523,7 @@ under the License.
         <auto-attributes mode="IN" include="pk" optional="false"/>
         <auto-attributes mode="IN" include="nonpk" optional="true"/>
     </service>
-    <service name="removeSupplierProductFeature" default-entity-name="SupplierProductFeature" engine="simple"
-        location="component://product/script/org/ofbiz/product/supplier/SupplierProductServices.xml" invoke="removeSupplierProductFeature" auth="true">
+    <service name="removeSupplierProductFeature" default-entity-name="SupplierProductFeature" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove a SupplierProduct record</description>
         <required-permissions join-type="AND">
             <check-permission permission="CATALOG" action="_DELETE"/>
@@ -598,15 +591,15 @@ under the License.
         <permission-service service-name="productGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="createCommunicationEventProduct" engine="simple"
-        location="component://product/script/org/ofbiz/product/communication/CommunicationEventServices.xml" invoke="createCommunicationEventProduct" auth="true">
+    <service name="createCommunicationEventProduct" default-entity-name="CommunicationEventProduct" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Communication Event Product</description>
-        <auto-attributes entity-name="CommunicationEventProduct" include="pk" mode="IN" optional="false"/>
+        <permission-service service-name="productGenericPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="removeCommunicationEventProduct" engine="simple"
-        location="component://product/script/org/ofbiz/product/communication/CommunicationEventServices.xml" invoke="removeCommunicationEventProduct" auth="true">
+    <service name="removeCommunicationEventProduct" default-entity-name="CommunicationEventProduct" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove a Communication Event Product</description>
-        <auto-attributes entity-name="CommunicationEventProduct" include="pk" mode="IN" optional="false"/>
+        <permission-service service-name="productGenericPermission" main-action="DELETE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- ======================================== -->
@@ -704,8 +697,7 @@ under the License.
         <attribute name="duplicateRoles" type="String" mode="IN" optional="true"/>
     </service>
 
-    <service name="safeAddProductToCategory" default-entity-name="ProductCategoryMember" engine="simple"
-                location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="addProductToCategory" auth="true">
+    <service name="safeAddProductToCategory" default-entity-name="ProductCategoryMember" engine="entity-auto" invoke="create" auth="true">
         <description>Add Product To Category</description>
         <permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -723,16 +715,14 @@ under the License.
         <attribute name="categories" type="Object" mode="IN" optional="false"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="addProductToCategory" default-entity-name="ProductCategoryMember" engine="simple"
-                location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="addProductToCategory" auth="true">
+    <service name="addProductToCategory" default-entity-name="ProductCategoryMember" engine="entity-auto" invoke="create" auth="true">
         <description>Add Product To Category</description>
         <permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" 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="updateProductToCategory" default-entity-name="ProductCategoryMember" engine="simple"
-                location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="updateProductToCategory" auth="true">
+    <service name="updateProductToCategory" default-entity-name="ProductCategoryMember" engine="entity-auto" invoke="update" auth="true">
         <description>Update a ProductCategoryMember</description>
         <permission-service service-name="checkCategoryPermissionWithViewPurchaseAllow" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -936,11 +926,9 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCategoryContent" default-entity-name="ProductCategoryContent" engine="simple"
-            location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="removeCategoryContent" auth="true">
+    <service name="removeCategoryContent" default-entity-name="ProductCategoryContent" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove Content From Category</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <service name="createSimpleTextContentForCategory" default-entity-name="ProductCategoryContent" engine="simple"
@@ -1018,13 +1006,11 @@ under the License.
     </service>
 
     <!-- ProductFeatureDataResource services -->
-    <service name="createProductFeatureDataResource" default-entity-name="ProductFeatureDataResource" engine="simple"
-            location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="createProductFeatureDataResource" auth="true">
+    <service name="createProductFeatureDataResource" default-entity-name="ProductFeatureDataResource" engine="entity-auto" invoke="create" auth="true">
         <description>Create ProductFeature-DataResource</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="removeProductFeatureDataResource" default-entity-name="ProductFeatureDataResource" engine="simple"
-            location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="removeProductFeatureDataResource" auth="true">
+    <service name="removeProductFeatureDataResource" default-entity-name="ProductFeatureDataResource" engine="entity-auto" invoke="remove" auth="true">
         <description>Remove ProductFeature-DataResource</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
@@ -1076,82 +1062,86 @@ under the License.
     </service>
 
     <!-- Product Configuration Services -->
-    <service name="createProductConfig" default-entity-name="ProductConfig" engine="simple"
-                location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="createProductConfig" auth="true">
+    <service name="createProductConfig" default-entity-name="ProductConfig" engine="entity-auto" invoke="create" auth="true">
         <description>Create a ProductConfig</description>
+        <permission-service service-name="productPriceGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" mode="INOUT" optional="true"/>
     </service>
-    <service name="updateProductConfig" default-entity-name="ProductConfig" engine="simple"
-                location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="updateProductConfig" auth="true">
+    <service name="updateProductConfig" default-entity-name="ProductConfig" engine="entity-auto" invoke="update" auth="true">
         <description>Update a ProductConfig</description>
+        <permission-service service-name="productPriceGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductConfig" default-entity-name="ProductConfig" engine="simple"
-                location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="deleteProductConfig" auth="true">
+    <service name="deleteProductConfig" default-entity-name="ProductConfig" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete a ProductConfig</description>
+        <permission-service service-name="productGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- Product Config Items Services -->
-    <service name="createProductConfigItem" default-entity-name="ProductConfigItem" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="createProductConfigItem">
-        <description>Create a Config Item</description>
-        <auto-attributes include="pk" mode="OUT" optional="false"/>
+    <service name="createProductConfigItem" default-entity-name="ProductConfigItem" engine="entity-auto" invoke="create" auth="true">
+        <description>Create a ProductConfigItem</description>
+        <permission-service service-name="productPriceGenericPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="fromDate" mode="INOUT" optional="true"/>
+        <override name="configItemId" mode="OUT"/>
     </service>
-    <service name="updateProductConfigItem" default-entity-name="ProductConfigItem" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="updateProductConfigItem">
-        <description>Update a Config Item</description>
+    <service name="updateProductConfigItem" default-entity-name="ProductConfigItem" engine="entity-auto" invoke="update" auth="true">
+        <description>Update a ProductConfigItem</description>
+        <permission-service service-name="productPriceGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductConfigItem" default-entity-name="ProductConfigItem" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="deleteProductConfigItem">
-        <description>Delete a Config Item</description>
+    <service name="deleteProductConfigItem" default-entity-name="ProductConfigItem" engine="entity-auto" invoke="delete" auth="true">
+        <description>Delete a ProductConfigItem</description>
+        <permission-service service-name="productPriceGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- Product Config Options Services -->
-    <service name="createProductConfigOption" default-entity-name="ProductConfigOption" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="createProductConfigOption">
+    <service name="createProductConfigOption" default-entity-name="ProductConfigOption" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Config Option</description>
+        <permission-service service-name="productGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="configItemId" type="String" mode="IN" optional="false"/><!-- FIXME -->
     </service>
-    <service name="updateProductConfigOption" default-entity-name="ProductConfigOption" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="updateProductConfigOption">
+    <service name="updateProductConfigOption" default-entity-name="ProductConfigOption" engine="entity-auto" invoke="update" auth="true">
         <description>Update a Config Option</description>
+        <permission-service service-name="productGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductConfigOption" default-entity-name="ProductConfigOption" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="deleteProductConfigOption">
+    <service name="deleteProductConfigOption" default-entity-name="ProductConfigOption" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete a Config Option</description>
+        <permission-service service-name="productGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- Product Config Product Services -->
-    <service name="createProductConfigProduct" default-entity-name="ProductConfigProduct" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="createProductConfigProduct">
+    <service name="createProductConfigProduct" default-entity-name="ProductConfigProduct" engine="entity-auto" invoke="create" auth="true">
         <description>Create a ProductConfigProduct</description>
+        <permission-service service-name="productGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="fromDate" mode="INOUT" optional="true"/>
     </service>
-    <service name="updateProductConfigProduct" default-entity-name="ProductConfigProduct" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="updateProductConfigProduct">
+    <service name="updateProductConfigProduct" default-entity-name="ProductConfigProduct" engine="entity-auto" invoke="update" auth="true">
         <description>Update a ProductConfigProduct</description>
+        <permission-service service-name="productGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductConfigProduct" default-entity-name="ProductConfigProduct" auth="true" engine="simple"
-        location="component://product/script/org/ofbiz/product/config/ConfigServices.xml" invoke="deleteProductConfigProduct">
-        <description>Delete ProductConfigProduct</description>
+    <service name="deleteProductConfigProduct" default-entity-name="ProductConfigProduct" engine="entity-auto" invoke="delete" auth="true">
+        <description>Delete a ProductConfigProduct</description>
+        <permission-service service-name="productGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
+
     <!-- Product Config Item content services -->
     <service name="createProductConfigItemContent" default-entity-name="ProdConfItemContent" engine="simple"
                 location="component://product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml" invoke="createProductConfigItemContent" auth="true">
@@ -1169,8 +1159,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeProductConfigItemContent" default-entity-name="ProdConfItemContent" engine="simple"
-                location="component://product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml" invoke="removeProductConfigItemContent" auth="true">
+    <service name="removeProductConfigItemContent" default-entity-name="ProdConfItemContent" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove Content From ProductConfigItem</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -1257,6 +1246,10 @@ under the License.
         location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="productCategoryGenericPermission">
         <implements service="permissionInterface"/>
     </service>
+    <service name="productPriceGenericPermission" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="productPriceGenericPermission">
+        <implements service="permissionInterface"/>
+    </service>
     <service name="checkCategoryPermissionWithViewPurchaseAllow" engine="simple"
         location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="checkCategoryPermissionWithViewPurchaseAllow">
         <implements service="permissionInterface"/>
@@ -1360,22 +1353,20 @@ under the License.
     </service>
     
     <!-- Product Promo Content services -->
-    <service name="createProductPromoContent" default-entity-name="ProductPromoContent" engine="simple"
-            location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="createProductPromoContent" auth="true">
+    <service name="createProductPromoContent" default-entity-name="ProductPromoContent" engine="entity-auto" invoke="create" auth="true">
         <description>Create Product Promo Content</description>
         <auto-attributes include="pk" mode="INOUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateProductPromoContent" default-entity-name="ProductPromoContent" engine="simple"
-            location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="updateProductPromoContent" auth="true">
+    <service name="updateProductPromoContent" default-entity-name="ProductPromoContent" engine="entity-auto" invoke="update" auth="true">
         <description>Update Product Promo Content</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="removeProductPromoContent" default-entity-name="ProductPromoContent" engine="simple"
             location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="removeProductPromoContent" auth="true">
-        <description>Remove Product Promo Content</description>
+        <description>Cancel by the thru date a Product Promo Content</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
@@ -1388,7 +1379,7 @@ under the License.
         <override name="productPromoContentTypeId" optional="false"/>
         <override name="productPromoId" optional="false"/>
     </service>
-    
+
     <!-- Image Management Services -->
     <service name="addMultipleuploadForProduct" default-entity-name="ProductContent" engine="java"
         location="org.ofbiz.product.imagemanagement.ImageManagementServices" invoke="addMultipleuploadForProduct" auth="true">
@@ -1403,7 +1394,7 @@ under the License.
         <override name="productContentTypeId" optional="false"/>
         <override name="productId" optional="false"/>
     </service>
-    
+
     <service name="multipleUploadProductImages" engine="simple"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="UploadProductImages" auth="true">
         <description>Multiple upload Images For Product</description>
@@ -1441,21 +1432,21 @@ under the License.
         <attribute name="_additionalImageTen_fileName" type="String" mode="IN" optional="true"/>
         <attribute name="_additionalImageTen_contentType" type="String" mode="IN" optional="true"/>
     </service>
-    
+
     <service name="removeProductContentAndImageFile" default-entity-name="ProductContent" engine="simple"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="removeProductContentAndImageFile" auth="true">
         <description>Remove Content From Product and File Image</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    
+
     <service name="removeProductContentForImageManagement" engine="simple"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="removeProductContentForImageManagement" auth="true">
         <description>Delete Product Content Relationship Entity</description>
         <attribute mode="IN" name="contentId" optional="false" type="String"/>
         <attribute mode="IN" name="productId" optional="false" type="String"/>
     </service>
-    
+
     <service name="removeImageFileForImageManagement" engine="java"
         location="org.ofbiz.product.imagemanagement.ImageManagementServices" invoke="removeImageFileForImageManagement" auth="true">
         <description>Delete Image File</description>
@@ -1464,7 +1455,7 @@ under the License.
         <attribute mode="IN" name="objectInfo" optional="false" type="String"/>
         <attribute mode="IN" name="dataResourceName" optional="false" type="String"/>
     </service>
-    
+
     <service name="addImageFrame" engine="java"
         location="org.ofbiz.product.imagemanagement.FrameImage" invoke="addImageFrame" auth="true">
         <description>Create Image Frame For Product.</description>
@@ -1475,13 +1466,13 @@ under the License.
         <attribute mode="IN" name="frameContentId" optional="false" type="String"/>
         <attribute mode="IN" name="frameDataResourceId" optional="false" type="String"/>
     </service>
-    
+
     <service name="uploadFrame" engine="java"
         location="org.ofbiz.product.imagemanagement.FrameImage" invoke="uploadFrame" auth="true">
         <description>Upload Image Frame.</description>
         <attribute mode="IN" name="uploadedFile" optional="false" type="java.nio.ByteBuffer"/>
     </service>
-    
+
     <service name="imageCrop" engine="java"
         location="org.ofbiz.product.imagemanagement.CropImage" invoke="imageCrop" auth="true">
         <description>Crop Image</description>
@@ -1492,7 +1483,7 @@ under the License.
         <attribute mode="IN" name="imageW" optional="false" type="String"/>
         <attribute mode="IN" name="imageH" optional="false" type="String"/>
     </service>
-    
+
     <service name="imageRotate" engine="java"
         location="org.ofbiz.product.imagemanagement.RotateImage" invoke="imageRotate" auth="true">
         <description>Rotate Image</description>
@@ -1500,7 +1491,7 @@ under the License.
         <attribute mode="IN" name="imageName" optional="false" type="String"/>
         <attribute mode="IN" name="angle" optional="false" type="String"/>
     </service>
-    
+
     <service name="setImageDetail" engine="simple" default-entity-name="ProductContent"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="setImageDetail" auth="true">
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -1509,19 +1500,19 @@ under the License.
         <attribute name="drIsPublic" mode="IN" type="String" optional="true" default-value="N"/>
         <attribute name="description" mode="IN" type="String" optional="true"/>
     </service>
-    
+
     <service name="updateStatusImageManagement" engine="simple"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="updateStatusImageManagement" auth="true">
         <attribute name="contentId" mode="IN" type="String" optional="false"/>
         <attribute name="checkStatusId" mode="IN" type="String" optional="true"/>
     </service>
-    
+
     <service name="addRejectedReasonImageManagement" engine="simple"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="addRejectedReasonImageManagement" auth="true">
         <attribute name="contentId" mode="IN" type="String" optional="false"/>
         <attribute name="description" mode="IN" type="String" optional="true"/>
     </service>
-    
+
     <service name="createImageContentApproval" engine="simple"
         location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="createImageContentApproval" auth="true">
         <attribute name="contentId" mode="IN" type="String" optional="false"/>

Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Wed Feb  3 07:27:21 2016
@@ -125,8 +125,7 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="createPhysicalInventory" default-entity-name="PhysicalInventory" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="createPhysicalInventory" auth="true">
+    <service name="createPhysicalInventory" default-entity-name="PhysicalInventory" engine="entity-auto" invoke="create" auth="true">
         <description>Create an PhysicalInventory</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
@@ -495,51 +494,44 @@ under the License.
         <attribute name="productStore" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/>
     </service>
 
-    <service name="createProductFacility" default-entity-name="ProductFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="createProductFacility" auth="true">
+    <service name="createProductFacility" default-entity-name="ProductFacility" engine="entity-auto" invoke="create" auth="true">
         <description>Create an ProductFacility</description>
         <permission-service service-name="checkProductFacilityRelatedPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateProductFacility" default-entity-name="ProductFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="updateProductFacility" auth="true">
+    <service name="updateProductFacility" default-entity-name="ProductFacility" engine="entity-auto" invoke="update" auth="true">
         <description>Update an ProductFacility</description>
         <permission-service service-name="checkProductFacilityRelatedPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductFacility" default-entity-name="ProductFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteProductFacility" auth="true">
+    <service name="deleteProductFacility" default-entity-name="ProductFacility" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an ProductFacility</description>
         <permission-service service-name="checkProductFacilityRelatedPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createProductFacilityLocation" default-entity-name="ProductFacilityLocation" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="createProductFacilityLocation" auth="true">
+    <service name="createProductFacilityLocation" default-entity-name="ProductFacilityLocation" engine="entity-auto" invoke="create" auth="true">
         <description>Create an ProductFacilityLocation</description>
         <permission-service service-name="checkProductFacilityRelatedPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateProductFacilityLocation" default-entity-name="ProductFacilityLocation" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="updateProductFacilityLocation" auth="true">
+    <service name="updateProductFacilityLocation" default-entity-name="ProductFacilityLocation" engine="entity-auto" invoke="update" auth="true">
         <description>Update an ProductFacilityLocation</description>
         <permission-service service-name="checkProductFacilityRelatedPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteProductFacilityLocation" default-entity-name="ProductFacilityLocation" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteProductFacilityLocation" auth="true">
+    <service name="deleteProductFacilityLocation" default-entity-name="ProductFacilityLocation" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an ProductFacilityLocation</description>
         <permission-service service-name="checkProductFacilityRelatedPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- Product Storage Services -->
-    <service name="createFacility" default-entity-name="Facility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="createFacility" auth="true">
+    <service name="createFacility" default-entity-name="Facility" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
@@ -548,32 +540,30 @@ under the License.
         <override name="facilityName" optional="false"/>
         <override name="ownerPartyId" optional="false"/>
     </service>
-    <service name="updateFacility" default-entity-name="Facility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacility" auth="true">
+    <service name="updateFacility" default-entity-name="Facility" engine="entity-auto" invoke="update" auth="true">
         <description>Update a Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteFacility" default-entity-name="Facility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacility" auth="true">
+    <service name="deleteFacility" default-entity-name="Facility" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete a Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <!-- Facility Attribute -->
-    <service name="createFacilityAttribute" engine="entity-auto" default-entity-name="FacilityAttribute" invoke="create" auth="true">
+    <service name="createFacilityAttribute" default-entity-name="FacilityAttribute" engine="entity-auto" invoke="create" auth="true">
         <description>Create Facility Attribute</description>
         <auto-attributes mode="IN" entity-name="FacilityAttribute" include="pk" optional="false"/>
         <auto-attributes mode="IN" entity-name="FacilityAttribute" include="nonpk" optional="true"/>
     </service>
-    <service name="updateFacilityAttribute" engine="entity-auto" default-entity-name="FacilityAttribute" invoke="update" auth="true">
+    <service name="updateFacilityAttribute" default-entity-name="FacilityAttribute" engine="entity-auto" invoke="update" auth="true">
         <description>Update Facility Attribute</description>
         <auto-attributes mode="IN" entity-name="FacilityAttribute" include="pk" optional="false"/>
         <auto-attributes mode="IN" entity-name="FacilityAttribute" include="nonpk" optional="true"/>
     </service>
-    <service name="deleteFacilityAttribute" engine="entity-auto" default-entity-name="FacilityAttribute" invoke="delete" auth="true">
+    <service name="deleteFacilityAttribute" default-entity-name="FacilityAttribute" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete Facility Attribute</description>
         <auto-attributes mode="IN" entity-name="FacilityAttribute" include="pk" optional="false"/>
     </service>
@@ -586,22 +576,19 @@ under the License.
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="locationSeqId" type="String" mode="OUT" optional="false"/>
     </service>
-    <service name="updateFacilityLocation" default-entity-name="FacilityLocation" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityLocation" auth="true">
+    <service name="updateFacilityLocation" default-entity-name="FacilityLocation" engine="entity-auto" invoke="update" auth="true">
         <description>Update a Facility Location</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteFacilityLocation" default-entity-name="FacilityLocation" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacilityLocation" auth="true">
+    <service name="deleteFacilityLocation" default-entity-name="FacilityLocation" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete a Facility Location</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createFacilityGroup" default-entity-name="FacilityGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="createFacilityGroup" auth="true">
+    <service name="createFacilityGroup" default-entity-name="FacilityGroup" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Facility Group</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
@@ -609,15 +596,13 @@ under the License.
         <override name="facilityGroupName" optional="false"/>
         <override name="facilityGroupTypeId" optional="false"/>
     </service>
-    <service name="updateFacilityGroup" default-entity-name="FacilityGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityGroup" auth="true">
+    <service name="updateFacilityGroup" default-entity-name="FacilityGroup" engine="entity-auto" invoke="update" auth="true">
         <description>Update a Facility Group</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteFacilityGroup" default-entity-name="FacilityGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacilityGroup" auth="true">
+    <service name="deleteFacilityGroup" default-entity-name="FacilityGroup" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete a Facility Group</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -712,124 +697,89 @@ under the License.
         <description>Delete a purpose for facility contact mech</description>
         <auto-attributes entity-name="FacilityContactMechPurpose" include="pk" mode="IN" optional="false"/>
     </service>
-
 <!-- end cm -->
-    <service name="addContactMechToFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="addContactMechToFacility" auth="true">
+
+    <service name="addContactMechToFacility" default-entity-name="FacilityContactMech" engine="entity-auto" invoke="create" auth="true">
         <description>Add ContactMech To Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
-        <attribute name="facilityId" type="String" mode="IN" optional="false"/>
-        <attribute name="contactMechId" type="String" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN"/>
     </service>
-    <service name="removeContactMechFromFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="removeContactMechFromFacility" auth="true">
+    <service name="removeContactMechFromFacility" default-entity-name="FacilityContactMech" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove ContactMech From Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
-        <attribute name="facilityId" type="String" mode="IN" optional="false"/>
-        <attribute name="contactMechId" type="String" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN"/>
     </service>
 
-    <service name="addFacilityToGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="addFacilityToGroup" auth="true">
+    <service name="addFacilityToGroup" default-entity-name="FacilityGroupMember" engine="entity-auto" invoke="create" auth="true">
         <description>Add Facility To FacilityGroup</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="facilityId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateFacilityToGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityToGroup" auth="true">
+    <service name="updateFacilityToGroup" default-entity-name="FacilityGroupMember" engine="entity-auto" invoke="update" auth="true">
         <description>Update Facility -> Group Member</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="facilityId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
-        <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeFacilityFromGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="removeFacilityFromGroup" auth="true">
+    <service name="removeFacilityFromGroup" default-entity-name="FacilityGroupMember" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove Facility From FacilityGroup</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="facilityId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN"/>
     </service>
 
-    <service name="addFacilityGroupToGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="addFacilityGroupToGroup" auth="true">
+    <service name="addFacilityGroupToGroup" default-entity-name="FacilityGroupRollup" engine="entity-auto" invoke="create" auth="true">
         <description>Add FacilityGroup To FacilityGroup</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="parentFacilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="fromDate" optional="true"/>
     </service>
-    <service name="updateFacilityGroupToGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityGroupToGroup" auth="true">
+    <service name="updateFacilityGroupToGroup" default-entity-name="FacilityGroupRollup" engine="entity-auto" invoke="update" auth="true">
         <description>Update FacilityGroup To FacilityGroup Rollup</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="parentFacilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
-        <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
-        <attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeFacilityGroupFromGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="removeFacilityGroupFromGroup" auth="true">
+    <service name="removeFacilityGroupFromGroup" default-entity-name="FacilityGroupRollup" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove FacilityGroup From FacilityGroup</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="parentFacilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN"/>
     </service>
 
-    <service name="addPartyToFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="addPartyToFacility" auth="true" default-entity-name="FacilityParty">
+    <service name="addPartyToFacility" default-entity-name="FacilityParty" engine="entity-auto" invoke="create" auth="true">
         <description>Create a FacilityParty record</description>
         <permission-service service-name="facilityGenericPermission" 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="addPartyToFacilityGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="addPartyToFacilityGroup" auth="true">
-        <description>Add Party To FacilityGroup</description>
-        <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="partyId" type="String" mode="IN" optional="false"/>
-        <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
-    </service>
-
-    <service name="removePartyFromFacility" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="removePartyFromFacility" auth="true" default-entity-name="FacilityParty">
+    <service name="removePartyFromFacility" default-entity-name="FacilityParty" engine="simple"
+                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="removePartyFromFacility" auth="true">
         <description>Remove Party From Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="removePartyFromFacilityGroup" engine="simple"
-                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="removePartyFromFacilityGroup" auth="true">
+    <service name="addPartyToFacilityGroup" default-entity-name="FacilityParty" engine="entity-auto" invoke="create" auth="true">
+        <description>Add Party To FacilityGroup</description>
+        <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="removePartyFromFacilityGroup" default-entity-name="FacilityParty" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove Party From FacilityGroup</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
-        <attribute name="facilityGroupId" type="String" mode="IN" optional="false"/>
-        <attribute name="partyId" type="String" mode="IN" optional="false"/>
-        <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createFacilityContent" engine="simple" default-entity-name="FacilityContent"
-        location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="createFacilityContent" auth="true">
+    <service name="createFacilityContent" default-entity-name="FacilityContent" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Facility Content</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-
-    <service name="deleteFacilityContent" engine="simple" default-entity-name="FacilityContent"
+    <service name="deleteFacilityContent" default-entity-name="FacilityContent" engine="simple"
                 location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacilityContent" auth="true">
         <description>Delete Content From Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
@@ -875,36 +825,31 @@ under the License.
         <attribute name="warningMessageList" type="List" mode="INOUT" optional="true"/>
     </service>
     <!-- Inventory Label Services -->
-    <service name="createInventoryItemLabelType" default-entity-name="InventoryItemLabelType" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="createInventoryItemLabelType" auth="true">
+    <service name="createInventoryItemLabelType" default-entity-name="InventoryItemLabelType" engine="entity-auto" invoke="create" auth="true">
         <description>Create an InventoryItemLabelType</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateInventoryItemLabelType" default-entity-name="InventoryItemLabelType" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="updateInventoryItemLabelType" auth="true">
+    <service name="updateInventoryItemLabelType" default-entity-name="InventoryItemLabelType" engine="entity-auto" invoke="update" auth="true">
         <description>Update an InventoryItemLabelType</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="deleteInventoryItemLabelType" default-entity-name="InventoryItemLabelType" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteInventoryItemLabelType" auth="true">
+    <service name="deleteInventoryItemLabelType" default-entity-name="InventoryItemLabelType" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an InventoryItemLabelType</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="createInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="createInventoryItemLabel" auth="true">
+    <service name="createInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="entity-auto" invoke="create" auth="true">
         <description>Create an InventoryItemLabel</description>
         <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="inventoryItemLabelTypeId" optional="false"/>
     </service>
-    <service name="updateInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="updateInventoryItemLabel" auth="true">
+    <service name="updateInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="entity-auto" invoke="update" auth="true">
         <description>Update an InventoryItemLabel</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -912,8 +857,7 @@ under the License.
             <exclude field-name="inventoryItemLabelTypeId"/>
         </auto-attributes>
     </service>
-    <service name="deleteInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteInventoryItemLabel" auth="true">
+    <service name="deleteInventoryItemLabel" default-entity-name="InventoryItemLabel" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an InventoryItemLabel</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -928,8 +872,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="inventoryItemLabelId" optional="false"/>
     </service>
-    <service name="updateInventoryItemLabelAppl" default-entity-name="InventoryItemLabelAppl" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="updateInventoryItemLabelAppl" auth="true">
+    <service name="updateInventoryItemLabelAppl" default-entity-name="InventoryItemLabelAppl" engine="entity-auto" invoke="update" auth="true">
         <description>Update an InventoryItemLabelAppl</description>
         <permission-service service-name="facilityGenericPermission" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -937,8 +880,7 @@ under the License.
             <exclude field-name="inventoryItemId"/>
         </auto-attributes>
     </service>
-    <service name="deleteInventoryItemLabelAppl" default-entity-name="InventoryItemLabelAppl" engine="simple"
-                location="component://product/script/org/ofbiz/product/inventory/InventoryServices.xml" invoke="deleteInventoryItemLabelAppl" auth="true">
+    <service name="deleteInventoryItemLabelAppl" default-entity-name="InventoryItemLabelAppl" engine="entity-auto" invoke="delete" auth="true">
         <description>Delete an InventoryItemLabelAppl</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>



Re: svn commit: r1728261 [2/3] - in /ofbiz/trunk/applications/product: script/org/ofbiz/product/category/ script/org/ofbiz/product/communication/ script/org/ofbiz/product/config/ script/org/ofbiz/product/inventory/ script/org/ofbiz/product/price/ script/or...

Posted by Nicolas Malin <ni...@nereide.fr>.
Le 14/02/2016 12:36, Jacques Le Roux a écrit :
>>
> The PartyRole creation (when missing) is lost here, this is the kind 
> of error you get: 

Ohhh yes you right, my bad the service have a seca on ensureNaPartyRole 
and not ensurePartyRole. I correct this !

Thanks Jacques
Nicolas

Re: svn commit: r1728261 [2/3] - in /ofbiz/trunk/applications/product: script/org/ofbiz/product/category/ script/org/ofbiz/product/communication/ script/org/ofbiz/product/config/ script/org/ofbiz/product/inventory/ script/org/ofbiz/product/price/ script/or...

Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Nicolas,

Le 03/02/2016 08:27, nmalin@apache.org a écrit :
> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=1728261&r1=1728260&r2=1728261&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
> +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Wed Feb  3 07:27:21 2016
[...]
> -    <!-- Facility Role / Facility Group Role Services -->
> -    <simple-method method-name="addPartyToFacility" short-description="Add Party to Facility">
> -        <set from-field="parameters.partyId" field="lookupPKMap.partyId"/>
> -        <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/>
> -        <find-by-primary-key entity-name="PartyRole" map="lookupPKMap" value-field="partyRole"/>
> -        <if-empty field="partyRole">
> -            <make-value value-field="partyRole" entity-name="PartyRole"/>
> -            <set-pk-fields map="lookupPKMap" value-field="partyRole"/>
> -            <create-value value-field="partyRole"/>
> -        </if-empty>
> -        <make-value value-field="newEntity" entity-name="FacilityParty"/>
> -        <set-pk-fields map="parameters" value-field="newEntity"/>
> -        <set-nonpk-fields map="parameters" value-field="newEntity"/>
> -             <if-empty field="newEntity.fromDate">
> -                 <now-timestamp field="newEntity.fromDate"/>
> -             </if-empty>
> -        <create-value value-field="newEntity"/>
> -    </simple-method>
> -
[...]
> -    <service name="addPartyToFacility" engine="simple"
> -                location="component://product/script/org/ofbiz/product/storage/StorageServices.xml" invoke="addPartyToFacility" auth="true" default-entity-name="FacilityParty">
> +    <service name="addPartyToFacility" default-entity-name="FacilityParty" engine="entity-auto" invoke="create" auth="true">
>           <description>Create a FacilityParty record</description>
>           <permission-service service-name="facilityGenericPermission" 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>
The PartyRole creation (when missing) is lost here, this is the kind of error you get:

Parameter Name Parameter Value Save Value ? errorMessage Error doing entity-auto operation for entity FacilityParty in service addPartyToFacility: 
org.ofbiz.entity.GenericEntityException: org.ofbiz.entity.GenericEntityException: Error while inserting: 
[GenericEntity:FacilityParty][createdStamp,2016-02-14 11:34:22.906(java.sql.Timestamp)][createdTxStamp,2016-02-14 
11:34:22.628(java.sql.Timestamp)][facilityId,WebStoreWarehouse(java.lang.String)][fromDate,2016-02-14 
11:34:22.906(java.sql.Timestamp)][lastUpdatedStamp,2016-02-14 11:34:22.906(java.sql.Timestamp)][lastUpdatedTxStamp,2016-02-14 
11:34:22.628(java.sql.Timestamp)][partyId,admin(java.lang.String)][roleTypeId,CONTENT_ADMIN(java.lang.String)][thruDate,null()] (SQL Exception while 
executing the following:INSERT INTO OFBIZ.FACILITY_PARTY (FACILITY_ID, PARTY_ID, ROLE_TYPE_ID, FROM_DATE, THRU_DATE, LAST_UPDATED_STAMP, 
LAST_UPDATED_TX_STAMP, CREATED_STAMP, CREATED_TX_STAMP) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) (INSERT on table 'FACILITY_PARTY' caused a violation of 
foreign key constraint 'FACILITY_PRTY_ROLE' for key (admin,CONTENT_ADMIN). The statement has been rolled back.)) (Error while inserting: 
[GenericEntity:FacilityParty][createdStamp,2016-02-14 11:34:22.906(java.sql.Timestamp)][createdTxStamp,2016-02-14 
11:34:22.628(java.sql.Timestamp)][facilityId,WebStoreWarehouse(java.lang.String)][fromDate,2016-02-14 
11:34:22.906(java.sql.Timestamp)][lastUpdatedStamp,2016-02-14 11:34:22.906(java.sql.Timestamp)][lastUpdatedTxStamp,2016-02-14 
11:34:22.628(java.sql.Timestamp)][partyId,admin(java.lang.String)][roleTypeId,CONTENT_ADMIN(java.lang.String)][thruDate,null()] (SQL Exception while 
executing the following:INSERT INTO OFBIZ.FACILITY_PARTY (FACILITY_ID, PARTY_ID, ROLE_TYPE_ID, FROM_DATE, THRU_DATE, LAST_UPDATED_STAMP, 
LAST_UPDATED_TX_STAMP, CREATED_STAMP, CREATED_TX_STAMP) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) (INSERT on table 'FACILITY_PARTY' caused a violation of 
foreign key constraint 'FACILITY_PRTY_ROLE' for key (admin,CONTENT_ADMIN). The statement has been rolled back.))

Jacques