svn commit: r1768190 - in /ofbiz/trunk/applications: marketing/minilang/permission/ marketing/servicedef/ product/minilang/permission/ product/servicedef/

[Deepak Dixit-5]

Author: deepak
Date: Sat Nov  5 11:24:54 2016
New Revision: 1768190

URL: http://svn.apache.org/viewvc?rev=1768190&view=rev
Log:
Improved: Removed duplicate permission serivice for marketing, also renamed facilityManagerPermission service to more generic name facilityPermissionCheck
(OFBIZ-8013)

Removed:
    ofbiz/trunk/applications/marketing/minilang/permission/
Modified:
    ofbiz/trunk/applications/marketing/servicedef/services.xml
    ofbiz/trunk/applications/product/minilang/permission/PermissionServices.xml
    ofbiz/trunk/applications/product/servicedef/services_facility.xml
    ofbiz/trunk/applications/product/servicedef/services_perm.xml
    ofbiz/trunk/applications/product/servicedef/services_picklist.xml

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1768190&r1=1768189&r2=1768190&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Sat Nov  5 11:24:54 2016
@@ -105,7 +105,7 @@ under the License.
     <service name="createContactList" default-entity-name="ContactList" engine="simple"
             location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="createContactList" auth="true">
         <description>Create a ContactList record</description>
-        <permission-service service-name="marketingManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="marketingPermissionService" main-action="CREATE"/>
         <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="contactListTypeId" optional="false"/>
@@ -274,21 +274,21 @@ under the License.
     <service name="createTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple"
             location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCodeType" auth="true">
         <description>Create a TrackingCodeType record</description>
-        <permission-service service-name="marketingManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="marketingPermissionService" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple"
             location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCodeType" auth="true">
         <description>Update a TrackingCodeType record</description>
-        <permission-service service-name="marketingManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="marketingPermissionService" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="deleteTrackingCodeType" default-entity-name="TrackingCodeType" engine="simple"
             location="component://marketing/minilang/marketing/tracking/TrackingCodeServices.xml" invoke="deleteTrackingCodeType" auth="true">
         <description>Update a TrackingCodeType record</description>
-        <permission-service service-name="marketingManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="marketingPermissionService" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
@@ -560,10 +560,5 @@ under the License.
         <description>Delete SegmentGroupType</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="marketingManagerPermission" engine="simple"
-            location="component://marketing/minilang/permission/PermissionServices.xml" invoke="marketingManagerPermission">
-        <description>Marketing Manager permission Checking Logic</description>
-        <implements service="permissionInterface"/>
-    </service>
 
 </services>

Modified: ofbiz/trunk/applications/product/minilang/permission/PermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/permission/PermissionServices.xml?rev=1768190&r1=1768189&r2=1768190&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/permission/PermissionServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/permission/PermissionServices.xml Sat Nov  5 11:24:54 2016
@@ -21,7 +21,7 @@ under the License.
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://ofbiz.apache.org/Simple-Method" xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd">
 
-    <simple-method method-name="facilityManagerPermission" short-description="Check user has facility Manager permission">
+    <simple-method method-name="facilityPermissionCheck" short-description="Check user has facility Manager permission">
         <set field="primaryPermission" value="FACILITY"/>
         <call-simple-method method-name="genericBasePermissionCheck" xml-resource="component://common/minilang/permission/CommonPermissionServices.xml"/>
     </simple-method>

Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=1768190&r1=1768189&r2=1768190&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Sat Nov  5 11:24:54 2016
@@ -615,7 +615,7 @@ under the License.
     <service name="createFacilityContactMech" engine="simple" debug="true"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="createFacilityContactMech" auth="true">
         <description>Create a FacilityContactMech</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="true"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
@@ -624,7 +624,7 @@ under the License.
     <service name="updateFacilityContactMech" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="updateFacilityContactMech" auth="true">
         <description>Update a FacilityContactMech</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/>
         <attribute name="contactMechTypeId" type="String" mode="IN" optional="false"/>
@@ -634,14 +634,14 @@ under the License.
     <service name="deleteFacilityContactMech" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="deleteFacilityContactMech" auth="true">
         <description>Delete a FacilityContactMech</description>
-        <permission-service service-name="facilityManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="DELETE"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="contactMechId" type="String" mode="IN" optional="false"/>
     </service>
     <service name="createFacilityPostalAddress" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="createFacilityPostalAddress" auth="true">
         <description>Create a Postal Address</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <auto-attributes entity-name="PostalAddress" include="nonpk" mode="IN" optional="true"/>
         <attribute name="paymentMethodId" type="String" mode="IN" optional="true"/>
@@ -654,7 +654,7 @@ under the License.
     <service name="updateFacilityPostalAddress" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="updateFacilityPostalAddress" auth="true">
         <description>Update a Postal Address</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <auto-attributes entity-name="PostalAddress" include="nonpk" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/>
@@ -663,7 +663,7 @@ under the License.
     <service name="createFacilityTelecomNumber" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="createFacilityTelecomNumber" auth="true">
         <description>Create a Telecommunications Number</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <auto-attributes entity-name="TelecomNumber" include="nonpk" mode="IN" optional="true"/>
         <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
@@ -672,7 +672,7 @@ under the License.
     <service name="updateFacilityTelecomNumber" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="updateFacilityTelecomNumber" auth="true">
         <description>Update a Telecommunications Number</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <auto-attributes entity-name="TelecomNumber" include="nonpk" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/>
@@ -680,7 +680,7 @@ under the License.
     <service name="createFacilityEmailAddress" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="createFacilityEmailAddress" auth="true">
         <description>Create an Email Address</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes entity-name="ContactMech" include="nonpk" mode="IN" optional="true"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
@@ -690,7 +690,7 @@ under the License.
     <service name="updateFacilityEmailAddress" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="updateFacilityEmailAddress" auth="true">
         <description>Update an Email Address</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes entity-name="FacilityContactMech" include="all" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="false"/>
         <attribute name="emailAddress" type="String" mode="IN" optional="false"/>
@@ -699,7 +699,7 @@ under the License.
     <service name="createFacilityContactMechPurpose" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="createFacilityContactMechPurpose">
         <description>Create a purpose for facility contact mech</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes entity-name="FacilityContactMechPurpose" include="pk" mode="IN" optional="false">
             <exclude field-name="fromDate"/>
         </auto-attributes>
@@ -708,7 +708,7 @@ under the License.
     <service name="deleteFacilityContactMechPurpose" engine="simple"
             location="component://product/minilang/product/storage/FacilityContactMechServices.xml" invoke="deleteFacilityContactMechPurpose">
         <description>Delete a purpose for facility contact mech</description>
-        <permission-service service-name="facilityManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="DELETE"/>
         <auto-attributes entity-name="FacilityContactMechPurpose" include="pk" mode="IN" optional="false"/>
     </service>
 <!-- end cm -->
@@ -809,7 +809,7 @@ under the License.
             sufficient availableToPromise to move the stock, in fact it is generally triggered because
             some promised inventory is in a bulk location and needs to be moved to a pick location.
         </description>
-        <permission-service service-name="facilityManagerPermission" main-action="VIEW"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="VIEW"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="moveByOisgirInfoList" type="List" mode="OUT" optional="true"/>
         <attribute name="stockMoveHandled" type="Map" mode="OUT" optional="true"/>
@@ -820,7 +820,7 @@ under the License.
         <description>
             Find all Stock Moves that should be done based on minimum quantities on each Pick/Primary ProductFacilityLocation.
         </description>
-        <permission-service service-name="facilityManagerPermission" main-action="VIEW"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="VIEW"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="stockMoveHandled" type="Map" mode="IN" optional="true"/>
         <attribute name="moveByPflInfoList" type="List" mode="OUT" optional="true"/>

Modified: ofbiz/trunk/applications/product/servicedef/services_perm.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_perm.xml?rev=1768190&r1=1768189&r2=1768190&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_perm.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_perm.xml Sat Nov  5 11:24:54 2016
@@ -23,8 +23,8 @@ under the License.
     <vendor>OFBiz</vendor>
     <version>1.0</version>
 
-    <service name="facilityManagerPermission" engine="simple"
-            location="component://product/minilang/permission/PermissionServices.xml" invoke="facilityManagerPermission">
+    <service name="facilityPermissionCheck" engine="simple"
+            location="component://product/minilang/permission/PermissionServices.xml" invoke="facilityPermissionCheck">
         <description>Facility Manager permission Checking Logic</description>
         <implements service="permissionInterface"/>
     </service>

Modified: ofbiz/trunk/applications/product/servicedef/services_picklist.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_picklist.xml?rev=1768190&r1=1768189&r2=1768190&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_picklist.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_picklist.xml Sat Nov  5 11:24:54 2016
@@ -35,7 +35,7 @@ under the License.
     <service name="findOrdersToPickMove" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="findOrdersToPickMove">
         <description>Gets Picklist Data</description>
-        <permission-service service-name="facilityManagerPermission" main-action="VIEW"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="VIEW"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="shipmentMethodTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="isRushOrder" type="String" mode="IN" optional="true"/>
@@ -53,7 +53,7 @@ under the License.
     <service name="createPicklistFromOrders" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="createPicklistFromOrders" transaction-timeout="600">
         <description>Create Picklist From Orders</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="shipmentMethodTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="maxNumberOfOrders" type="Long" mode="IN" optional="true"/>
@@ -80,7 +80,7 @@ under the License.
     <service name="getPicklistDisplayInfo" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="getPicklistDisplayInfo">
         <description>Create Picklist From Orders</description>
-        <permission-service service-name="facilityManagerPermission" main-action="VIEW"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="VIEW"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="viewIndex" mode="INOUT" type="Integer" optional="true"/>
         <attribute name="viewSize" mode="INOUT" type="Integer" optional="true"/>
@@ -93,7 +93,7 @@ under the License.
     <service name="getPickAndPackReportInfo" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="getPickAndPackReportInfo">
         <description>Get Pick And Pack Report Info</description>
-        <permission-service service-name="facilityManagerPermission" main-action="VIEW"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="VIEW"/>
         <attribute name="picklistId" type="String" mode="IN" optional="false"/>
         <attribute name="picklistInfo" type="Map" mode="OUT" optional="false"/>
         <attribute name="facilityLocationInfoList" type="List" mode="OUT" optional="true"/>
@@ -104,7 +104,7 @@ under the License.
     <service name="createPicklist" default-entity-name="Picklist" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="createPicklist" auth="true">
         <description>Create Picklist</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
             <exclude field-name="picklistDate"/>
@@ -115,7 +115,7 @@ under the License.
     <service name="updatePicklist" default-entity-name="Picklist" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="updatePicklist" auth="true">
         <description>Update Picklist</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
             <exclude field-name="picklistDate"/>
@@ -127,7 +127,7 @@ under the License.
     <service name="deletePicklist" default-entity-name="Picklist" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="deletePicklist" auth="true">
         <description>Delete Picklist</description>
-        <permission-service service-name="facilityManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
@@ -135,27 +135,27 @@ under the License.
     <service name="createPicklistBin" default-entity-name="PicklistBin" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="createPicklistBin" auth="true">
         <description>Create PicklistBin</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
     <service name="updatePicklistBin" default-entity-name="PicklistBin" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="updatePicklistBin" auth="true">
         <description>Update PicklistBin</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="deletePicklistBin" default-entity-name="PicklistBin" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="deletePicklistBin" auth="true">
         <description>Delete PicklistBin</description>
-        <permission-service service-name="facilityManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="checkPicklistBinItemStatuses" default-entity-name="PicklistBin" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="checkPicklistBinItemStatuses" auth="true">
         <description>Update Picklist based on Item Status</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
@@ -163,7 +163,7 @@ under the License.
     <service name="createPicklistItem" default-entity-name="PicklistItem" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="createPicklistItem" auth="true">
         <description>Create PicklistItem</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
         <override name="itemStatusId" optional="true"/>
@@ -171,7 +171,7 @@ under the License.
     <service name="updatePicklistItem" default-entity-name="PicklistItem" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="updatePicklistItem" auth="true">
         <description>Update PicklistItem</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="oldItemStatusId" type="String" mode="OUT" optional="true"/>
@@ -179,7 +179,7 @@ under the License.
     <service name="deletePicklistItem" default-entity-name="PicklistItem" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="deletePicklistItem" auth="true">
         <description>Delete PicklistItem</description>
-        <permission-service service-name="facilityManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
     <service name="editPicklistItem" default-entity-name="PicklistItem" engine="simple"
@@ -195,7 +195,7 @@ under the License.
     <service name="setPicklistItemToComplete" default-entity-name="PicklistItem" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="setPicklistItemToComplete" auth="true">
         <description>Update PicklistItem's Status to COMPLETE</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
@@ -209,7 +209,7 @@ under the License.
     <service name="createPicklistRole" default-entity-name="PicklistRole" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="createPicklistRole" auth="true">
         <description>Create PicklistRole</description>
-        <permission-service service-name="facilityManagerPermission" main-action="CREATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="CREATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
             <exclude field-name="createdByUserLogin"/>
@@ -220,7 +220,7 @@ under the License.
     <service name="updatePicklistRole" default-entity-name="PicklistRole" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="updatePicklistRole" auth="true">
         <description>Update PicklistRole</description>
-        <permission-service service-name="facilityManagerPermission" main-action="UPDATE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true">
             <exclude field-name="createdByUserLogin"/>
@@ -230,7 +230,7 @@ under the License.
     <service name="deletePicklistRole" default-entity-name="PicklistRole" engine="simple"
             location="component://product/minilang/shipment/picklist/PicklistServices.xml" invoke="deletePicklistRole" auth="true">
         <description>Delete PicklistRole</description>
-        <permission-service service-name="facilityManagerPermission" main-action="DELETE"/>
+        <permission-service service-name="facilityPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 </services>