Repository: stratos Updated Branches: refs/heads/master 7c4377cab -> 7a4cd0052
Moving stratos permission set to /permission/admin Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7a4cd005 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7a4cd005 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7a4cd005 Branch: refs/heads/master Commit: 7a4cd0052ba82b76f4de7f017839ea99fd774061 Parents: 7c4377c Author: Imesh Gunaratne <[email protected]> Authored: Thu May 21 16:03:35 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu May 21 16:04:26 2015 +0530 ---------------------------------------------------------------------- .../src/main/resources/META-INF/component.xml | 22 +-- .../src/main/resources/META-INF/component.xml | 28 +-- .../console/controllers/menu/menu.json | 180 +++++++++---------- .../manager/utils/PermissionConstants.java | 64 +++---- .../src/main/resources/META-INF/component.xml | 22 +-- .../rest/endpoint/api/StratosApiV41.java | 120 ++++++------- 6 files changed, 218 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7a4cd005/components/org.apache.stratos.autoscaler/src/main/resources/META-INF/component.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.autoscaler/src/main/resources/META-INF/component.xml index 298674b..3cd4e21 100644 --- a/components/org.apache.stratos.autoscaler/src/main/resources/META-INF/component.xml +++ b/components/org.apache.stratos.autoscaler/src/main/resources/META-INF/component.xml @@ -22,50 +22,50 @@ <ManagementPermissions> <!-- /Stratos --> <ManagementPermission> - <DisplayName>Stratos Permissions</DisplayName> - <ResourceId>/permission/stratos</ResourceId> + <DisplayName>Stratos</DisplayName> + <ResourceId>/permission/admin/stratos</ResourceId> </ManagementPermission> <!-- /Stratos/Autoscaling Policies --> <ManagementPermission> <DisplayName>Autoscaling Policies</DisplayName> - <ResourceId>/permission/stratos/autoscalingPolicies</ResourceId> + <ResourceId>/permission/admin/stratos/autoscalingPolicies</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Autoscaling Policies</DisplayName> - <ResourceId>/permission/stratos/autoscalingPolicies/manage</ResourceId> + <ResourceId>/permission/admin/stratos/autoscalingPolicies/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Autoscaling Policies</DisplayName> - <ResourceId>/permission/stratos/autoscalingPolicies/view</ResourceId> + <ResourceId>/permission/admin/stratos/autoscalingPolicies/view</ResourceId> </ManagementPermission> <!-- /Stratos/Kubernetes Clusters --> <ManagementPermission> <DisplayName>Kubernetes Clusters</DisplayName> - <ResourceId>/permission/stratos/kubernetesClusters</ResourceId> + <ResourceId>/permission/admin/stratos/kubernetesClusters</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Kubernetes Clusters</DisplayName> - <ResourceId>/permission/stratos/kubernetesClusters/manage</ResourceId> + <ResourceId>/permission/admin/stratos/kubernetesClusters/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Kubernetes Clusters</DisplayName> - <ResourceId>/permission/stratos/kubernetesClusters/view</ResourceId> + <ResourceId>/permission/admin/stratos/kubernetesClusters/view</ResourceId> </ManagementPermission> <!-- /Stratos/Application Policies--> <ManagementPermission> <DisplayName>Application Policies</DisplayName> - <ResourceId>/permission/stratos/applicationPolicies</ResourceId> + <ResourceId>/permission/admin/stratos/applicationPolicies</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Application Policies</DisplayName> - <ResourceId>/permission/stratos/applicationPolicies/manage</ResourceId> + <ResourceId>/permission/admin/stratos/applicationPolicies/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Application Policies</DisplayName> - <ResourceId>/permission/stratos/applicationPolicies/view</ResourceId> + <ResourceId>/permission/admin/stratos/applicationPolicies/view</ResourceId> </ManagementPermission> </ManagementPermissions> </component> http://git-wip-us.apache.org/repos/asf/stratos/blob/7a4cd005/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 beae63f..ba2582e 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 @@ -27,64 +27,64 @@ <ManagementPermissions> <!-- /Stratos--> <ManagementPermission> - <DisplayName>Stratos Permissions</DisplayName> - <ResourceId>/permission/stratos</ResourceId> + <DisplayName>Stratos</DisplayName> + <ResourceId>/permission/admin/stratos</ResourceId> </ManagementPermission> <!-- /Stratos/Cartridges--> <ManagementPermission> <DisplayName>Cartridges</DisplayName> - <ResourceId>/permission/stratos/cartridges</ResourceId> + <ResourceId>/permission/admin/stratos/cartridges</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Cartridges</DisplayName> - <ResourceId>/permission/stratos/cartridges/manage</ResourceId> + <ResourceId>/permission/admin/stratos/cartridges/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Cartridges</DisplayName> - <ResourceId>/permission/stratos/cartridges/view</ResourceId> + <ResourceId>/permission/admin/stratos/cartridges/view</ResourceId> </ManagementPermission> <!-- /Stratos/Cartridge Groups --> <ManagementPermission> <DisplayName>Cartridge Groups</DisplayName> - <ResourceId>/permission/stratos/cartridgeGroups</ResourceId> + <ResourceId>/permission/admin/stratos/cartridgeGroups</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Cartridge Groups</DisplayName> - <ResourceId>/permission/stratos/cartridgeGroups/manage</ResourceId> + <ResourceId>/permission/admin/stratos/cartridgeGroups/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Cartridge Groups</DisplayName> - <ResourceId>/permission/stratos/cartridgeGroups/view</ResourceId> + <ResourceId>/permission/admin/stratos/cartridgeGroups/view</ResourceId> </ManagementPermission> <!-- /Stratos/Deployment Policies --> <ManagementPermission> <DisplayName>Deployment Policies</DisplayName> - <ResourceId>/permission/stratos/deploymentPolicies</ResourceId> + <ResourceId>/permission/admin/stratos/deploymentPolicies</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Deployment Policies</DisplayName> - <ResourceId>/permission/stratos/deploymentPolicies/manage</ResourceId> + <ResourceId>/permission/admin/stratos/deploymentPolicies/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Deployment Policies</DisplayName> - <ResourceId>/permission/stratos/deploymentPolicies/view</ResourceId> + <ResourceId>/permission/admin/stratos/deploymentPolicies/view</ResourceId> </ManagementPermission> <!-- /Stratos/Network Partitions --> <ManagementPermission> <DisplayName>Network Partitions</DisplayName> - <ResourceId>/permission/stratos/networkPartitions</ResourceId> + <ResourceId>/permission/admin/stratos/networkPartitions</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Network Partitions</DisplayName> - <ResourceId>/permission/stratos/networkPartitions/manage</ResourceId> + <ResourceId>/permission/admin/stratos/networkPartitions/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Network Partitions</DisplayName> - <ResourceId>/permission/stratos/networkPartitions/view</ResourceId> + <ResourceId>/permission/admin/stratos/networkPartitions/view</ResourceId> </ManagementPermission> </ManagementPermissions> </component> http://git-wip-us.apache.org/repos/asf/stratos/blob/7a4cd005/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json index 37e2218..2105883 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json +++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json @@ -9,28 +9,28 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos", - "/permission/stratos/networkpartitions", - "/permission/stratos/networkpartitions/manage", - "/permission/stratos/networkpartitions/view", - "/permission/stratos/autoscalingpolicies", - "/permission/stratos/autoscalingpolicies/manage", - "/permission/stratos/autoscalingpolicies/view", - "/permission/stratos/deploymentpolicies", - "/permission/stratos/deploymentpolicies/manage", - "/permission/stratos/deploymentpolicies/view", - "/permission/stratos/applicationpolicies", - "/permission/stratos/applicationpolicies/manage", - "/permission/stratos/applicationpolicies/view", - "/permission/stratos/cartridges", - "/permission/stratos/cartridges/manage", - "/permission/stratos/cartridges/view", - "/permission/stratos/cartridgegroups", - "/permission/stratos/cartridgegroups/manage", - "/permission/stratos/cartridgegroups/view", - "/permission/stratos/kubernetesclusters", - "/permission/stratos/kubernetesclusters/manage", - "/permission/stratos/kubernetesclusters/view" + "/permission/admin/stratos", + "/permission/admin/stratos/networkpartitions", + "/permission/admin/stratos/networkpartitions/manage", + "/permission/admin/stratos/networkpartitions/view", + "/permission/admin/stratos/autoscalingpolicies", + "/permission/admin/stratos/autoscalingpolicies/manage", + "/permission/admin/stratos/autoscalingpolicies/view", + "/permission/admin/stratos/deploymentpolicies", + "/permission/admin/stratos/deploymentpolicies/manage", + "/permission/admin/stratos/deploymentpolicies/view", + "/permission/admin/stratos/applicationpolicies", + "/permission/admin/stratos/applicationpolicies/manage", + "/permission/admin/stratos/applicationpolicies/view", + "/permission/admin/stratos/cartridges", + "/permission/admin/stratos/cartridges/manage", + "/permission/admin/stratos/cartridges/view", + "/permission/admin/stratos/cartridgegroups", + "/permission/admin/stratos/cartridgegroups/manage", + "/permission/admin/stratos/cartridgegroups/view", + "/permission/admin/stratos/kubernetesclusters", + "/permission/admin/stratos/kubernetesclusters/manage", + "/permission/admin/stratos/kubernetesclusters/view" ], "description": "Configure network partitions, policies, cartridges, cartridge groups and kubernetes clusters", "sub-menu": [ @@ -43,9 +43,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/networkpartitions", - "/permission/stratos/networkpartitions/manage", - "/permission/stratos/networkpartitions/view" + "/permission/admin/stratos/networkpartitions", + "/permission/admin/stratos/networkpartitions/manage", + "/permission/admin/stratos/networkpartitions/view" ], "description": "Manage network partitions." }, @@ -58,9 +58,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/autoscalingpolicies", - "/permission/stratos/autoscalingpolicies/manage", - "/permission/stratos/autoscalingpolicies/view" + "/permission/admin/stratos/autoscalingpolicies", + "/permission/admin/stratos/autoscalingpolicies/manage", + "/permission/admin/stratos/autoscalingpolicies/view" ], "description": "Manage policies which specify autoscaling threshold values." }, @@ -73,9 +73,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/deploymentpolicies", - "/permission/stratos/deploymentpolicies/manage", - "/permission/stratos/deploymentpolicies/view" + "/permission/admin/stratos/deploymentpolicies", + "/permission/admin/stratos/deploymentpolicies/manage", + "/permission/admin/stratos/deploymentpolicies/view" ], "description": "Manage policies which specify cartridge deployment in partitions." }, @@ -88,9 +88,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/applicationpolicies", - "/permission/stratos/applicationpolicies/manage", - "/permission/stratos/applicationpolicies/view" + "/permission/admin/stratos/applicationpolicies", + "/permission/admin/stratos/applicationpolicies/manage", + "/permission/admin/stratos/applicationpolicies/view" ], "description": "Manage policies which specify application deployment in network partitions." }, @@ -103,9 +103,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/cartridges", - "/permission/stratos/cartridges/manage", - "/permission/stratos/cartridges/view" + "/permission/admin/stratos/cartridges", + "/permission/admin/stratos/cartridges/manage", + "/permission/admin/stratos/cartridges/view" ], "description": "Manage single-tenant & multi-tenant cartridges." }, @@ -118,9 +118,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/cartridgegroups", - "/permission/stratos/cartridgegroups/manage", - "/permission/stratos/cartridgegroups/view" + "/permission/admin/stratos/cartridgegroups", + "/permission/admin/stratos/cartridgegroups/manage", + "/permission/admin/stratos/cartridgegroups/view" ], "description": "Manage cartridge groups" }, @@ -133,9 +133,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/kubernetesclusters", - "/permission/stratos/kubernetesclusters/manage", - "/permission/stratos/kubernetesclusters/view" + "/permission/admin/stratos/kubernetesclusters", + "/permission/admin/stratos/kubernetesclusters/manage", + "/permission/admin/stratos/kubernetesclusters/view" ], "description": "Manage Kubernetes clusters." } @@ -184,9 +184,9 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos/applications", - "/permission/stratos/applications/manage", - "/permission/stratos/applications/view"], + "/permission/admin/stratos/applications", + "/permission/admin/stratos/applications/manage", + "/permission/admin/stratos/applications/view"], "description": "Manage applications." }, { @@ -198,28 +198,28 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos", - "/permission/stratos/networkpartitions", - "/permission/stratos/networkpartitions/manage", - "/permission/stratos/networkpartitions/view", - "/permission/stratos/autoscalingpolicies", - "/permission/stratos/autoscalingpolicies/manage", - "/permission/stratos/autoscalingpolicies/view", - "/permission/stratos/deploymentpolicies", - "/permission/stratos/deploymentpolicies/manage", - "/permission/stratos/deploymentpolicies/view", - "/permission/stratos/applicationpolicies", - "/permission/stratos/applicationpolicies/manage", - "/permission/stratos/applicationpolicies/view", - "/permission/stratos/cartridges", - "/permission/stratos/cartridges/manage", - "/permission/stratos/cartridges/view", - "/permission/stratos/cartridgegroups", - "/permission/stratos/cartridgegroups/manage", - "/permission/stratos/cartridgegroups/view", - "/permission/stratos/kubernetesclusters", - "/permission/stratos/kubernetesclusters/manage", - "/permission/stratos/kubernetesclusters/view" + "/permission/admin/stratos", + "/permission/admin/stratos/networkpartitions", + "/permission/admin/stratos/networkpartitions/manage", + "/permission/admin/stratos/networkpartitions/view", + "/permission/admin/stratos/autoscalingpolicies", + "/permission/admin/stratos/autoscalingpolicies/manage", + "/permission/admin/stratos/autoscalingpolicies/view", + "/permission/admin/stratos/deploymentpolicies", + "/permission/admin/stratos/deploymentpolicies/manage", + "/permission/admin/stratos/deploymentpolicies/view", + "/permission/admin/stratos/applicationpolicies", + "/permission/admin/stratos/applicationpolicies/manage", + "/permission/admin/stratos/applicationpolicies/view", + "/permission/admin/stratos/cartridges", + "/permission/admin/stratos/cartridges/manage", + "/permission/admin/stratos/cartridges/view", + "/permission/admin/stratos/cartridgegroups", + "/permission/admin/stratos/cartridgegroups/manage", + "/permission/admin/stratos/cartridgegroups/view", + "/permission/admin/stratos/kubernetesclusters", + "/permission/admin/stratos/kubernetesclusters/manage", + "/permission/admin/stratos/kubernetesclusters/view" ], "description": "Report your issues that you find." }, @@ -232,28 +232,28 @@ "permissionPaths": [ "/permission", "/permission/admin", - "/permission/stratos", - "/permission/stratos/networkpartitions", - "/permission/stratos/networkpartitions/manage", - "/permission/stratos/networkpartitions/view", - "/permission/stratos/autoscalingpolicies", - "/permission/stratos/autoscalingpolicies/manage", - "/permission/stratos/autoscalingpolicies/view", - "/permission/stratos/deploymentpolicies", - "/permission/stratos/deploymentpolicies/manage", - "/permission/stratos/deploymentpolicies/view", - "/permission/stratos/applicationpolicies", - "/permission/stratos/applicationpolicies/manage", - "/permission/stratos/applicationpolicies/view", - "/permission/stratos/cartridges", - "/permission/stratos/cartridges/manage", - "/permission/stratos/cartridges/view", - "/permission/stratos/cartridgegroups", - "/permission/stratos/cartridgegroups/manage", - "/permission/stratos/cartridgegroups/view", - "/permission/stratos/kubernetesclusters", - "/permission/stratos/kubernetesclusters/manage", - "/permission/stratos/kubernetesclusters/view" + "/permission/admin/stratos", + "/permission/admin/stratos/networkpartitions", + "/permission/admin/stratos/networkpartitions/manage", + "/permission/admin/stratos/networkpartitions/view", + "/permission/admin/stratos/autoscalingpolicies", + "/permission/admin/stratos/autoscalingpolicies/manage", + "/permission/admin/stratos/autoscalingpolicies/view", + "/permission/admin/stratos/deploymentpolicies", + "/permission/admin/stratos/deploymentpolicies/manage", + "/permission/admin/stratos/deploymentpolicies/view", + "/permission/admin/stratos/applicationpolicies", + "/permission/admin/stratos/applicationpolicies/manage", + "/permission/admin/stratos/applicationpolicies/view", + "/permission/admin/stratos/cartridges", + "/permission/admin/stratos/cartridges/manage", + "/permission/admin/stratos/cartridges/view", + "/permission/admin/stratos/cartridgegroups", + "/permission/admin/stratos/cartridgegroups/manage", + "/permission/admin/stratos/cartridgegroups/view", + "/permission/admin/stratos/kubernetesclusters", + "/permission/admin/stratos/kubernetesclusters/manage", + "/permission/admin/stratos/kubernetesclusters/view" ], "icon": "fa-book", "description": "Read documentation to get more information." http://git-wip-us.apache.org/repos/asf/stratos/blob/7a4cd005/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 60d11a0..0d129aa 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 @@ -21,37 +21,37 @@ package org.apache.stratos.manager.utils; public class PermissionConstants { - public static final String[] STRATOS_PERMISSIONS = new String[]{ - "/permission/stratos", - "/permission/stratos/autoscalingPolicies", - "/permission/stratos/autoscalingPolicies/manage", - "/permission/stratos/autoscalingPolicies/view", - "/permission/stratos/kubernetesClusters", - "/permission/stratos/kubernetesClusters/manage", - "/permission/stratos/kubernetesClusters/view", - "/permission/stratos/applicationPolicies", - "/permission/stratos/applicationPolicies/manage", - "/permission/stratos/applicationPolicies/view", - "/permission/stratos/cartridges", - "/permission/stratos/cartridges/manage", - "/permission/stratos/cartridges/view", - "/permission/stratos/cartridgeGroups", - "/permission/stratos/cartridgeGroups/manage", - "/permission/stratos/cartridgeGroups/view", - "/permission/stratos/deploymentPolicies", - "/permission/stratos/deploymentPolicies/manage", - "/permission/stratos/deploymentPolicies/view", - "/permission/stratos/networkPartitions", - "/permission/stratos/networkPartitions/manage", - "/permission/stratos/networkPartitions/view", - "/permission/stratos/applications", - "/permission/stratos/applications/manage", - "/permission/stratos/applications/view", - "/permission/stratos/applicationSignUps", - "/permission/stratos/applicationSignUps/manage", - "/permission/stratos/applicationSignUps/view", - "/permission/stratos/domainMappings", - "/permission/stratos/domainMappings/manage", - "/permission/stratos/domainMappings/view", + public static final String[] STRATOS_PERMISSIONS = new String[] { + "/permission/admin/stratos", + "/permission/admin/stratos/autoscalingPolicies", + "/permission/admin/stratos/autoscalingPolicies/manage", + "/permission/admin/stratos/autoscalingPolicies/view", + "/permission/admin/stratos/kubernetesClusters", + "/permission/admin/stratos/kubernetesClusters/manage", + "/permission/admin/stratos/kubernetesClusters/view", + "/permission/admin/stratos/applicationPolicies", + "/permission/admin/stratos/applicationPolicies/manage", + "/permission/admin/stratos/applicationPolicies/view", + "/permission/admin/stratos/cartridges", + "/permission/admin/stratos/cartridges/manage", + "/permission/admin/stratos/cartridges/view", + "/permission/admin/stratos/cartridgeGroups", + "/permission/admin/stratos/cartridgeGroups/manage", + "/permission/admin/stratos/cartridgeGroups/view", + "/permission/admin/stratos/deploymentPolicies", + "/permission/admin/stratos/deploymentPolicies/manage", + "/permission/admin/stratos/deploymentPolicies/view", + "/permission/admin/stratos/networkPartitions", + "/permission/admin/stratos/networkPartitions/manage", + "/permission/admin/stratos/networkPartitions/view", + "/permission/admin/stratos/applications", + "/permission/admin/stratos/applications/manage", + "/permission/admin/stratos/applications/view", + "/permission/admin/stratos/applicationSignUps", + "/permission/admin/stratos/applicationSignUps/manage", + "/permission/admin/stratos/applicationSignUps/view", + "/permission/admin/stratos/domainMappings", + "/permission/admin/stratos/domainMappings/manage", + "/permission/admin/stratos/domainMappings/view", }; } http://git-wip-us.apache.org/repos/asf/stratos/blob/7a4cd005/components/org.apache.stratos.manager/src/main/resources/META-INF/component.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.manager/src/main/resources/META-INF/component.xml index 4b88f35..1f50c29 100644 --- a/components/org.apache.stratos.manager/src/main/resources/META-INF/component.xml +++ b/components/org.apache.stratos.manager/src/main/resources/META-INF/component.xml @@ -20,50 +20,50 @@ <ManagementPermissions> <!-- /Stratos --> <ManagementPermission> - <DisplayName>Stratos Permissions</DisplayName> - <ResourceId>/permission/stratos</ResourceId> + <DisplayName>Stratos</DisplayName> + <ResourceId>/permission/admin/stratos</ResourceId> </ManagementPermission> <!-- /Stratos/Applications --> <ManagementPermission> <DisplayName>Applications</DisplayName> - <ResourceId>/permission/stratos/applications</ResourceId> + <ResourceId>/permission/admin/stratos/applications</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Applications</DisplayName> - <ResourceId>/permission/stratos/applications/manage</ResourceId> + <ResourceId>/permission/admin/stratos/applications/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Applications</DisplayName> - <ResourceId>/permission/stratos/applications/view</ResourceId> + <ResourceId>/permission/admin/stratos/applications/view</ResourceId> </ManagementPermission> <!-- /Stratos/Application SignUps--> <ManagementPermission> <DisplayName>Application Sign Ups</DisplayName> - <ResourceId>/permission/stratos/applicationSignUps</ResourceId> + <ResourceId>/permission/admin/stratos/applicationSignUps</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Application Sign Ups</DisplayName> - <ResourceId>/permission/stratos/applicationSignUps/manage</ResourceId> + <ResourceId>/permission/admin/stratos/applicationSignUps/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Application Sign Ups</DisplayName> - <ResourceId>/permission/stratos/applicationSignUps/view</ResourceId> + <ResourceId>/permission/admin/stratos/applicationSignUps/view</ResourceId> </ManagementPermission> <!-- /Stratos/Domain Mappings --> <ManagementPermission> <DisplayName>Domain Mappings</DisplayName> - <ResourceId>/permission/stratos/domainMappings</ResourceId> + <ResourceId>/permission/admin/stratos/domainMappings</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>Manage Domain Mappings</DisplayName> - <ResourceId>/permission/stratos/domainMappings/manage</ResourceId> + <ResourceId>/permission/admin/stratos/domainMappings/manage</ResourceId> </ManagementPermission> <ManagementPermission> <DisplayName>View Domain Mappings</DisplayName> - <ResourceId>/permission/stratos/domainMappings/view</ResourceId> + <ResourceId>/permission/admin/stratos/domainMappings/view</ResourceId> </ManagementPermission> </ManagementPermissions> </component> http://git-wip-us.apache.org/repos/asf/stratos/blob/7a4cd005/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 0960549..fc363ee 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -126,7 +126,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/deploymentPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/deploymentPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/manage") public Response addDeploymentPolicy( DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException { @@ -157,7 +157,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/deploymentPolicies/{deploymentPolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/deploymentPolicies/view") + @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/view") public Response getDeploymentPolicy( @PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { DeploymentPolicyBean deploymentPolicyBean = StratosApiV41Utils.getDeployementPolicy(deploymentPolicyId); @@ -178,7 +178,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/deploymentPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/deploymentPolicies/view") + @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/view") public Response getDeploymentPolicies() throws RestAPIException { DeploymentPolicyBean[] deploymentPolicies = StratosApiV41Utils.getDeployementPolicies(); @@ -201,7 +201,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/deploymentPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/deploymentPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/manage") public Response updateDeploymentPolicy( DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException { @@ -241,7 +241,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/deploymentPolicies/{deploymentPolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/deploymentPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/deploymentPolicies/manage") public Response removeDeploymentPolicy( @PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { try { @@ -270,7 +270,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/manage") + @AuthorizationAction("/permission/admin/stratos/cartridges/manage") public Response addCartridge( CartridgeBean cartridgeDefinitionBean) throws RestAPIException { @@ -300,7 +300,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/manage") + @AuthorizationAction("/permission/admin/stratos/cartridges/manage") public Response updateCartridge( CartridgeBean cartridgeDefinitionBean) throws RestAPIException { StratosApiV41Utils.updateCartridge(cartridgeDefinitionBean); @@ -321,7 +321,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/view") + @AuthorizationAction("/permission/admin/stratos/cartridges/view") public Response getCartridges() throws RestAPIException { @@ -346,7 +346,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges/{cartridgeType}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/view") + @AuthorizationAction("/permission/admin/stratos/cartridges/view") public Response getCartridge( @PathParam("cartridgeType") String cartridgeType) throws RestAPIException { CartridgeBean cartridge; @@ -371,7 +371,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges/filter/{filter}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/view") + @AuthorizationAction("/permission/admin/stratos/cartridges/view") public Response getCartridgesByFilter( @DefaultValue("") @PathParam("filter") String filter, @QueryParam("criteria") String criteria) throws RestAPIException { @@ -398,7 +398,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges/{cartridgeType}/filter/{filter}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/view") + @AuthorizationAction("/permission/admin/stratos/cartridges/view") public Response getCartridgeByFilter( @PathParam("cartridgeType") String cartridgeType, @DefaultValue("") @PathParam("filter") String filter) throws RestAPIException { @@ -424,7 +424,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridges/{cartridgeType}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridges/manage") + @AuthorizationAction("/permission/admin/stratos/cartridges/manage") public Response removeCartridge( @PathParam("cartridgeType") String cartridgeType) throws RestAPIException { try { @@ -456,7 +456,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridgeGroups") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridgeGroups/manage") + @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/manage") @SuperTenantService(true) public Response addCartridgeGroup( CartridgeGroupBean cartridgeGroupBean) throws RestAPIException { @@ -495,7 +495,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridgeGroups") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridgeGroups/manage") + @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/manage") public Response updateCartridgeGroup( CartridgeGroupBean cartridgeGroupBean) throws RestAPIException { @@ -528,7 +528,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridgeGroups/{name}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridgeGroups/view") + @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/view") public Response getCartridgeGroup( @PathParam("name") String name) throws RestAPIException { CartridgeGroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(name); @@ -551,7 +551,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridgeGroups") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridgeGroups/view") + @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/view") public Response getCartridgeGroups() throws RestAPIException { CartridgeGroupBean[] serviceGroups = StratosApiV41Utils.getServiceGroupDefinitions(); @@ -575,7 +575,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cartridgeGroups/{name}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/cartridgeGroups/manage") + @AuthorizationAction("/permission/admin/stratos/cartridgeGroups/manage") @SuperTenantService(true) public Response removeServiceGroup( @PathParam("name") String name) throws RestAPIException { @@ -603,7 +603,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/networkPartitions") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/networkPartitions/manage") + @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage") public Response addNetworkPartition( NetworkPartitionBean networkPartitionBean) throws RestAPIException { String networkPartitionId = networkPartitionBean.getId(); @@ -637,7 +637,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/networkPartitions") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/networkPartitions/view") + @AuthorizationAction("/permission/admin/stratos/networkPartitions/view") public Response getNetworkPartitions() throws RestAPIException { NetworkPartitionBean[] networkPartitions = StratosApiV41Utils.getNetworkPartitions(); @@ -658,7 +658,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/networkPartitions/{networkPartitionId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/networkPartitions/view") + @AuthorizationAction("/permission/admin/stratos/networkPartitions/view") public Response getNetworkPartition( @PathParam("networkPartitionId") String networkPartitionId) throws RestAPIException { NetworkPartitionBean networkPartition = StratosApiV41Utils.getNetworkPartition(networkPartitionId); @@ -681,7 +681,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/networkPartitions") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/networkPartitions/manage") + @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage") public Response updateNetworkPartition( NetworkPartitionBean networkPartition) throws RestAPIException { @@ -705,7 +705,7 @@ public class StratosApiV41 extends AbstractApi { */ @DELETE @Path("/networkPartitions/{networkPartitionId}") - @AuthorizationAction("/permission/stratos/networkPartitions/manage") + @AuthorizationAction("/permission/admin/stratos/networkPartitions/manage") public Response removeNetworkPartition( @PathParam("networkPartitionId") String networkPartitionId) throws RestAPIException { @@ -733,7 +733,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/manage") + @AuthorizationAction("/permission/admin/stratos/applications/manage") public Response addApplication(ApplicationBean applicationDefinition) throws RestAPIException { try { StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), @@ -773,7 +773,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/manage") + @AuthorizationAction("/permission/admin/stratos/applications/manage") public Response updateApplication(ApplicationBean applicationDefinition) throws RestAPIException { try { @@ -807,7 +807,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/view") + @AuthorizationAction("/permission/admin/stratos/applications/view") public Response getApplications() throws RestAPIException { List<ApplicationBean> applicationDefinitions = StratosApiV41Utils.getApplications(); if (applicationDefinitions == null || applicationDefinitions.isEmpty()) { @@ -831,7 +831,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/view") + @AuthorizationAction("/permission/admin/stratos/applications/view") public Response getApplication( @PathParam("applicationId") String applicationId) throws RestAPIException { ApplicationBean applicationDefinition = StratosApiV41Utils.getApplication(applicationId); @@ -854,7 +854,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/deploy/{applicationPolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/manage") + @AuthorizationAction("/permission/admin/stratos/applications/manage") public Response deployApplication( @PathParam("applicationId") String applicationId, @PathParam("applicationPolicyId") String applicationPolicyId) throws RestAPIException { @@ -886,7 +886,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applicationPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/applicationPolicies/manage") public Response addApplicationPolicy( ApplicationPolicyBean applicationPolicy) throws RestAPIException { try { @@ -921,7 +921,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applicationPolicies/{applicationPolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationPolicies/view") + @AuthorizationAction("/permission/admin/stratos/applicationPolicies/view") public Response getApplicationPolicy( @PathParam("applicationPolicyId") String applicationPolicyId) throws RestAPIException { try { @@ -947,7 +947,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applicationPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationPolicies/view") + @AuthorizationAction("/permission/admin/stratos/applicationPolicies/view") public Response getApplicationPolicies() throws RestAPIException { ApplicationPolicyBean[] applicationPolicies = StratosApiV41Utils.getApplicationPolicies(); @@ -969,7 +969,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applicationPolicies/{applicationPolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/applicationPolicies/manage") public Response removeApplicationPolicy( @PathParam("applicationPolicyId") String applicationPolicyId) throws RestAPIException { try { @@ -1005,7 +1005,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applicationPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/applicationPolicies/manage") public Response updateApplicationPolicy( ApplicationPolicyBean applicationPolicy) throws RestAPIException { @@ -1036,7 +1036,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/networkPartitions") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/view") + @AuthorizationAction("/permission/admin/stratos/applications/view") public Response getApplicationNetworkPartitions( @PathParam("applicationId") String applicationId) throws RestAPIException { ApplicationNetworkPartitionIdListBean appNetworkPartitionsBean = StratosApiV41Utils @@ -1063,7 +1063,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/signup") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationSignUps/manage") + @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage") public Response addApplicationSignUp( @PathParam("applicationId") String applicationId, ApplicationSignUpBean applicationSignUpBean) throws RestAPIException { @@ -1084,7 +1084,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/signup") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationSignUps/view") + @AuthorizationAction("/permission/admin/stratos/applicationSignUps/view") public Response getApplicationSignUp( @PathParam("applicationId") String applicationId) throws RestAPIException, StratosManagerServiceApplicationSignUpExceptionException { @@ -1114,7 +1114,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/signup") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applicationSignUps/manage") + @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage") public Response removeApplicationSignUp( @PathParam("applicationId") String applicationId) throws RestAPIException { StratosApiV41Utils.removeApplicationSignUp(applicationId); @@ -1134,7 +1134,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/domainMappings") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/domainMappings/manage") + @AuthorizationAction("/permission/admin/stratos/domainMappings/manage") public Response addDomainMappings( @PathParam("applicationId") String applicationId, ApplicationDomainMappingsBean domainMappingsBean) throws RestAPIException { @@ -1168,7 +1168,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/domainMappings/{domainName}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/domainMappings/manage") + @AuthorizationAction("/permission/admin/stratos/domainMappings/manage") public Response removeDomainMappings( @PathParam("applicationId") String applicationId, @PathParam("domainName") String domainName) throws RestAPIException { @@ -1194,7 +1194,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/domainMappings") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/domainMappings/view") + @AuthorizationAction("/permission/admin/stratos/domainMappings/view") public Response getDomainMappings( @PathParam("applicationId") String applicationId) throws RestAPIException { List<DomainMappingBean> domainMappingsBeanList = null; @@ -1229,7 +1229,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}/undeploy") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/manage") + @AuthorizationAction("/permission/admin/stratos/applications/manage") public Response undeployApplication( @PathParam("applicationId") String applicationId, @QueryParam("force") @DefaultValue("false") boolean force) throws RestAPIException { @@ -1265,7 +1265,7 @@ public class StratosApiV41 extends AbstractApi { @GET @Path("/applications/{applicationId}/runtime") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/view") + @AuthorizationAction("/permission/admin/stratos/applications/view") public Response getApplicationRuntime( @PathParam("applicationId") String applicationId) throws RestAPIException { ApplicationInfoBean applicationRuntime = StratosApiV41Utils.getApplicationRuntime(applicationId); @@ -1289,7 +1289,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/applications/{applicationId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/manage") + @AuthorizationAction("/permission/admin/stratos/applications/manage") @SuperTenantService(true) public Response removeApplication( @PathParam("applicationId") String applicationId) throws RestAPIException { @@ -1322,7 +1322,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/autoscalingPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/autoscalingPolicies/view") + @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/view") public Response getAutoscalingPolicies() throws RestAPIException { AutoscalePolicyBean[] autoScalePolicies = StratosApiV41Utils.getAutoScalePolicies(); @@ -1344,7 +1344,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/autoscalingPolicies/{autoscalePolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/autoscalingPolicies/view") + @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/view") public Response getAutoscalingPolicy( @PathParam("autoscalePolicyId") String autoscalePolicyId) throws RestAPIException { AutoscalePolicyBean autoScalePolicy = StratosApiV41Utils.getAutoScalePolicy(autoscalePolicyId); @@ -1366,7 +1366,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/autoscalingPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/autoscalingPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/manage") public Response addAutoscalingPolicy( AutoscalePolicyBean autoscalePolicy) throws RestAPIException { @@ -1398,7 +1398,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/autoscalingPolicies") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/autoscalingPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/manage") public Response updateAutoscalingPolicy( AutoscalePolicyBean autoscalePolicy) throws RestAPIException { @@ -1424,7 +1424,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/autoscalingPolicies/{autoscalingPolicyId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/autoscalingPolicies/manage") + @AuthorizationAction("/permission/admin/stratos/autoscalingPolicies/manage") public Response removeAutoscalingPolicy( @PathParam("autoscalingPolicyId") String autoscalingPolicyId) throws RestAPIException { @@ -1454,7 +1454,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/cluster/{clusterId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/view") + @AuthorizationAction("/permission/admin/stratos/applications/view") public Response getCluster( @PathParam("clusterId") String clusterId) throws RestAPIException { try { @@ -1722,7 +1722,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/repo/notify") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/applications/manage") + @AuthorizationAction("/permission/admin/stratos/applications/manage") public Response notifyRepository( GitNotificationPayloadBean payload) throws RestAPIException { if (log.isInfoEnabled()) { @@ -1837,7 +1837,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response addKubernetesCluster( KubernetesClusterBean kubernetesCluster) throws RestAPIException { @@ -1869,7 +1869,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response updateKubernetesCluster( KubernetesClusterBean kubernetesCluster) throws RestAPIException { @@ -1899,7 +1899,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}/minion") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response addKubernetesHost( @PathParam("kubernetesClusterId") String kubernetesClusterId, KubernetesHostBean kubernetesHost) throws RestAPIException { @@ -1921,7 +1921,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}/master") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response updateKubernetesMaster( KubernetesMasterBean kubernetesMaster) throws RestAPIException { try { @@ -1940,7 +1940,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/host") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response updateKubernetesHost( KubernetesHostBean kubernetesHost) throws RestAPIException { try { @@ -1965,7 +1965,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/view") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/view") public Response getKubernetesHostClusters() throws RestAPIException { KubernetesClusterBean[] availableKubernetesClusters = StratosApiV41Utils.getAvailableKubernetesClusters(); if (availableKubernetesClusters == null || availableKubernetesClusters.length == 0) { @@ -1986,7 +1986,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/view") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/view") public Response getKubernetesHostCluster( @PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { @@ -2008,7 +2008,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}/hosts") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/view") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/view") public Response getKubernetesHostsOfKubernetesCluster( @PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { @@ -2030,7 +2030,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}/master") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/view") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/view") public Response getKubernetesMasterOfKubernetesCluster( @PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { @@ -2052,7 +2052,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response removeKubernetesHostCluster( @PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { @@ -2080,7 +2080,7 @@ public class StratosApiV41 extends AbstractApi { @Path("/kubernetesClusters/{kubernetesClusterId}/hosts/{hostId}") @Produces("application/json") @Consumes("application/json") - @AuthorizationAction("/permission/stratos/kubernetesClusters/manage") + @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/manage") public Response removeKubernetesHostOfKubernetesCluster( @PathParam("hostId") String kubernetesHostId) throws RestAPIException { try {
