svn commit: r575499 - in /ofbiz/trunk/applications/product: script/org/ofbiz/product/inventory/InventoryServices.xml script/org/ofbiz/product/storage/StorageServices.xml servicedef/services_facility.xml

[adrianc]

Author: adrianc
Date: Thu Sep 13 17:16:14 2007
New Revision: 575499

URL: http://svn.apache.org/viewvc?rev=575499&view=rev
Log:
Converted embedded Facility permissions checking to service-based permissions checking. Also added check for ADMIN permission, which wasn't being done.

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
    ofbiz/trunk/applications/product/servicedef/services_facility.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=575499&r1=575498&r2=575499&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Thu Sep 13 17:16:14 2007
@@ -36,7 +36,9 @@
                 <not>
                     <or>
                         <if-has-permission permission="CATALOG" action="_${checkAction}"/>
+                        <if-has-permission permission="CATALOG_ADMIN"/>
                         <if-has-permission permission="FACILITY" action="_${checkAction}"/>
+                        <if-has-permission permission="FACILITY_ADMIN"/>
                         <and>
                             <not><if-empty field-name="alternatePermissionRoot"/></not>
                             <if-has-permission permission="${alternatePermissionRoot}" action="_${checkAction}"/>

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=575499&r1=575498&r2=575499&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 Thu Sep 13 17:16:14 2007
@@ -22,9 +22,6 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <!-- Facility Services -->
     <simple-method method-name="createFacility" short-description="Create a Facility">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run createFacility you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="Facility"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -36,17 +33,12 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFacility" short-description="Update a Facility">
-        <check-permission permission="FACILITY" action="_UPDATE"><fail-message message="Security Error: to run updateFacility you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <find-by-primary-key entity-name="Facility" map-name="lookupPKMap" value-name="facility"/>
         <set-nonpk-fields map-name="parameters" value-name="facility"/>
         <store-value value-name="facility"/>
     </simple-method>
     <simple-method method-name="deleteFacility" short-description="Delete a Facility">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run deleteFacility you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <find-by-primary-key entity-name="Facility" map-name="lookupPKMap" value-name="facility"/>
         <remove-value value-name="facility"/>
@@ -54,17 +46,11 @@
 
     <!-- Facility ContactMech Services -->
     <simple-method method-name="addContactMechToFacility" short-description="Add ContactMech To Facility">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run addContactMechToFacility you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityContactMech"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="removeContactMechFromFacility" short-description="Remove ContactMech From Facility">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run removeContactMechFromFacility you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.contactMechId" from-field="parameters.contactMechId" />
         <find-by-primary-key entity-name="FacilityContactMech" map-name="lookupPKMap" value-name="facilityContactMech"/>
@@ -73,9 +59,6 @@
     
     <!-- Facility Location Services -->
     <simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run createFacilityLocation you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityLocation"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set field="newEntity.facilityId" from-field="parameters.facilityId" />
@@ -107,9 +90,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFacilityLocation" short-description="Update a Facility Location">
-        <check-permission permission="FACILITY" action="_UPDATE"><fail-message message="Security Error: to run updateFacilityLocation you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
         <find-by-primary-key entity-name="FacilityLocation" map-name="lookupPKMap" value-name="facilityLocation"/>
@@ -117,9 +97,6 @@
         <store-value value-name="facilityLocation"/>
     </simple-method>
     <simple-method method-name="deleteFacilityLocation" short-description="Delete a Facility Location">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run deleteFacilityLocation you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
         <find-by-primary-key entity-name="FacilityLocation" map-name="lookupPKMap" value-name="facilityLocation"/>
@@ -128,9 +105,6 @@
     
     <!-- Facility Group Services -->
     <simple-method method-name="createFacilityGroup" short-description="Create an Facility Group">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run createFacilityGroup you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityGroup"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         
@@ -142,18 +116,12 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFacilityGroup" short-description="Update an Facility Group">
-        <check-permission permission="FACILITY" action="_UPDATE"><fail-message message="Security Error: to run updateFacilityGroup you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
         <find-by-primary-key entity-name="FacilityGroup" map-name="lookupPKMap" value-name="facilityGroup"/>
         <set-nonpk-fields map-name="parameters" value-name="facilityGroup"/>
         <store-value value-name="facilityGroup"/>
     </simple-method>
     <simple-method method-name="deleteFacilityGroup" short-description="Delete an Facility Group">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run deleteFacilityGroup you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
         <find-by-primary-key entity-name="FacilityGroup" map-name="lookupPKMap" value-name="facilityGroup"/>
         <remove-value value-name="facilityGroup"/>
@@ -161,9 +129,6 @@
     
     <!-- Facility Member Services -->
     <simple-method method-name="addFacilityToGroup" short-description="Add Facility to FacilityGroup">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run addFacilityToGroup you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityGroupMember"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -176,9 +141,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFacilityToGroup" short-description="Update Facility to FacilityGroup Application">
-        <check-permission permission="FACILITY" action="_UPDATE"><fail-message message="Security Error: to run updateFacilityToGroup you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="FacilityGroupMember"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupMember" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -186,9 +148,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run removeFacilityFromGroup you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="FacilityGroupMember"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupMember" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -197,9 +156,6 @@
     
     <!-- Facility Group Rollup Services -->
     <simple-method method-name="addFacilityGroupToGroup" short-description="Add FacilityGroup to FacilityGroup">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run addFacilityGroupToGroup you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityGroupRollup"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -212,9 +168,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFacilityGroupToGroup" short-description="Update FacilityGroup to FacilityGroup Rollup">
-        <check-permission permission="FACILITY" action="_UPDATE"><fail-message message="Security Error: to run updateFacilityGroupToGroup you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="FacilityGroupRollup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupRollup" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -222,9 +175,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run removeFacilityGroupFromGroup you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="FacilityGroupRollup"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupRollup" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -233,9 +183,6 @@
         
     <!-- Facility Role / Facility Group Role Services -->
     <simple-method method-name="addPartyToFacility" short-description="Add Party to Facility">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run addPartyToFacility you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -243,9 +190,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="addPartyToFacilityGroup" short-description="Add Party to FacilityGroup">
-        <check-permission permission="FACILITY" action="_CREATE"><fail-message message="Security Error: to run addPartyToFacilityGroup you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="newEntity" entity-name="FacilityGroupRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -254,18 +198,12 @@
     </simple-method>        
     
     <simple-method method-name="removePartyFromFacility" short-description="Remove Party From Facility">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run removePartyFromFacility you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="FacilityRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>        
     <simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
-        <check-permission permission="FACILITY" action="_DELETE"><fail-message message="Security Error: to run removePartyFromFacilityGroup you must have the FACILITY_DELETE or FACILITY_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="FacilityGroupRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupRole" map-name="lookupPKMap" value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=575499&r1=575498&r2=575499&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Thu Sep 13 17:16:14 2007
@@ -457,6 +457,7 @@
     <service name="createFacility" default-entity-name="Facility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="createFacility" auth="true">
         <description>Create a Facility</description>
+        <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="facilityTypeId" optional="false"/>
@@ -466,18 +467,21 @@
     <service name="updateFacility" default-entity-name="Facility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacility" 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="org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacility" auth="true">
         <description>Delete a Facility</description>
+        <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createFacilityLocation" default-entity-name="FacilityLocation" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="createFacilityLocation" auth="true">
         <description>Create a Facility Location</description>
+        <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="locationSeqId" type="String" mode="OUT" optional="false"/>
@@ -485,18 +489,21 @@
     <service name="updateFacilityLocation" default-entity-name="FacilityLocation" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityLocation" 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="org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacilityLocation" 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="org/ofbiz/product/storage/StorageServices.xml" invoke="createFacilityGroup" auth="true">
         <description>Create a Facility Group</description>
+        <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <auto-attributes include="pk" mode="OUT" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="facilityGroupName" optional="false"/>
@@ -505,12 +512,14 @@
     <service name="updateFacilityGroup" default-entity-name="FacilityGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityGroup" 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="org/ofbiz/product/storage/StorageServices.xml" invoke="deleteFacilityGroup" auth="true">
         <description>Delete a Facility Group</description>
+        <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
@@ -608,12 +617,14 @@
     <service name="addContactMechToFacility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="addContactMechToFacility" 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"/>
     </service>
     <service name="removeContactMechFromFacility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="removeContactMechFromFacility" 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"/>
     </service>
@@ -621,6 +632,7 @@
     <service name="addFacilityToGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="addFacilityToGroup" 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"/>
@@ -630,6 +642,7 @@
     <service name="updateFacilityToGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityToGroup" 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"/>
@@ -639,6 +652,7 @@
     <service name="removeFacilityFromGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="removeFacilityFromGroup" 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"/>
@@ -647,6 +661,7 @@
     <service name="addFacilityGroupToGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="addFacilityGroupToGroup" 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"/>
@@ -656,6 +671,7 @@
     <service name="updateFacilityGroupToGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="updateFacilityGroupToGroup" 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"/>
@@ -665,6 +681,7 @@
     <service name="removeFacilityGroupFromGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="removeFacilityGroupFromGroup" 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"/>
@@ -673,6 +690,7 @@
     <service name="addPartyToFacility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="addPartyToFacility" auth="true">
         <description>Add Party To Facility</description>
+        <permission-service service-name="facilityGenericPermission" main-action="CREATE"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
@@ -680,6 +698,7 @@
     <service name="addPartyToFacilityGroup" engine="simple"
                 location="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"/>
@@ -688,6 +707,7 @@
     <service name="removePartyFromFacility" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="removePartyFromFacility" auth="true">
         <description>Remove Party From Facility</description>
+        <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="false"/>
         <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
@@ -695,6 +715,7 @@
     <service name="removePartyFromFacilityGroup" engine="simple"
                 location="org/ofbiz/product/storage/StorageServices.xml" invoke="removePartyFromFacilityGroup" 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"/>