Repository: stratos Updated Branches: refs/heads/master 497a90df2 -> 930dfa5e2
Renaming service group to cartridge group in permissions Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/930dfa5e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/930dfa5e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/930dfa5e Branch: refs/heads/master Commit: 930dfa5e260131bc11018d2de3df7fe41b2a4936 Parents: 497a90d Author: Imesh Gunaratne <[email protected]> Authored: Tue May 19 23:15:24 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue May 19 23:15:24 2015 +0530 ---------------------------------------------------------------------- .../src/main/resources/META-INF/component.xml | 16 ++++++++-------- .../stratos/manager/utils/PermissionConstants.java | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/930dfa5e/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml index 3de412c..59d7e3f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml +++ b/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml @@ -38,7 +38,7 @@ <ResourceId>/permission/admin/manage/getCartridges</ResourceId> </ManagementPermission> <ManagementPermission> - <DisplayName>Get Cartridge By Filter</DisplayName> + <DisplayName>Get Cartridges By Filter</DisplayName> <ResourceId>/permission/admin/manage/getCartridgesByFilter</ResourceId> </ManagementPermission> <ManagementPermission> @@ -46,12 +46,12 @@ <ResourceId>/permission/admin/manage/removeCartridge</ResourceId> </ManagementPermission> <ManagementPermission> - <DisplayName>Add Service Group</DisplayName> - <ResourceId>/permission/admin/manage/addServiceGroup</ResourceId> + <DisplayName>Add Cartridge Group</DisplayName> + <ResourceId>/permission/admin/manage/addCartridgeGroup</ResourceId> </ManagementPermission> <ManagementPermission> - <DisplayName>Get Service Group Definition</DisplayName> - <ResourceId>/permission/admin/manage/getServiceGroupDefinition</ResourceId> + <DisplayName>Get Cartridge Groups</DisplayName> + <ResourceId>/permission/admin/manage/getCartridgeGroups</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Remove Service Group Definition</DisplayName> @@ -62,8 +62,8 @@ <ResourceId>/permission/admin/manage/addDeploymentPolicy</ResourceId> </ManagementPermission> <ManagementPermission> - <DisplayName>Get Deployment Policy</DisplayName> - <ResourceId>/permission/admin/manage/getDeploymentPolicy</ResourceId> + <DisplayName>Get Deployment Policies</DisplayName> + <ResourceId>/permission/admin/manage/getDeploymentPolicies</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Update Deployment Policy</DisplayName> @@ -82,7 +82,7 @@ <ResourceId>/permission/admin/manage/updateNetworkPartition</ResourceId> </ManagementPermission> <ManagementPermission> - <DisplayName>Get Network Partition</DisplayName> + <DisplayName>Get Network Partitions</DisplayName> <ResourceId>/permission/admin/manage/getNetworkPartitions</ResourceId> </ManagementPermission> <ManagementPermission> http://git-wip-us.apache.org/repos/asf/stratos/blob/930dfa5e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java index c65d64c..29a5e85 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/PermissionConstants.java @@ -28,11 +28,11 @@ public class PermissionConstants { "/permission/admin/manage/getCartridges", "/permission/admin/manage/getCartridgesByFilter", "/permission/admin/manage/removeCartridge", - "/permission/admin/manage/addServiceGroup", - "/permission/admin/manage/getServiceGroupDefinition", + "/permission/admin/manage/addCartridgeGroup", + "/permission/admin/manage/getCartridgeGroups", "/permission/admin/manage/removeServiceGroup", "/permission/admin/manage/addDeploymentPolicy", - "/permission/admin/manage/getDeploymentPolicy", + "/permission/admin/manage/getDeploymentPolicies", "/permission/admin/manage/updateDeploymentPolicy", "/permission/admin/manage/removeDeploymentPolicy", "/permission/admin/manage/addNetworkPartition",
