You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/17 15:13:02 UTC
stratos git commit: fixing authorization action in some rest APIs
Repository: stratos
Updated Branches:
refs/heads/4.1.0-beta-deployment-policy-fix b6b679ed0 -> 4dc650a4f
fixing authorization action in some rest APIs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4dc650a4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4dc650a4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4dc650a4
Branch: refs/heads/4.1.0-beta-deployment-policy-fix
Commit: 4dc650a4f385f42d1a00a05c8a7534bf06a4d8ec
Parents: b6b679e
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Feb 17 19:42:25 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Feb 17 19:42:25 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/META-INF/component.xml | 16 -----------
.../src/main/resources/META-INF/component.xml | 28 ++++++++++++++++++++
.../rest/endpoint/api/StratosApiV41.java | 4 +--
3 files changed, 30 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4dc650a4/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 dab3559..9fbeb2a 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
@@ -33,26 +33,10 @@
<ResourceId>/permission/admin/manage/updateAutoscalingPolicy</ResourceId>
</ManagementPermission>
<ManagementPermission>
- <DisplayName>Update Network Partition</DisplayName>
- <ResourceId>/permission/protected/manage/updateNetworkPartition</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
<DisplayName>Remove Autoscaling Policy</DisplayName>
<ResourceId>/permission/admin/manage/removeAutoscalingPolicy</ResourceId>
</ManagementPermission>
<ManagementPermission>
- <DisplayName>Add Network Partition</DisplayName>
- <ResourceId>/permission/protected/manage/addNetworkPartition</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
- <DisplayName>Get Network Partition</DisplayName>
- <ResourceId>/permission/protected/manage/getNetworkPartitions</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
- <DisplayName>Remove Network Partition</DisplayName>
- <ResourceId>/permission/protected/manage/removeNetworkPartition</ResourceId>
- </ManagementPermission>
- <ManagementPermission>
<DisplayName>Add Kubernetes Host Cluster</DisplayName>
<ResourceId>/permission/admin/manage/addKubernetesHostCluster</ResourceId>
</ManagementPermission>
http://git-wip-us.apache.org/repos/asf/stratos/blob/4dc650a4/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 c38b745..ffbc794 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
@@ -67,5 +67,33 @@
<DisplayName>Remove Service Group Definition</DisplayName>
<ResourceId>/permission/protected/manage/removeServiceGroup</ResourceId>
</ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Add Deployment Policy</DisplayName>
+ <ResourceId>/permission/admin/manage/addDeploymentPolicy</ResourceId>
+ </ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Update Deployment Policy</DisplayName>
+ <ResourceId>/permission/admin/manage/updateDeploymentPolicy</ResourceId>
+ </ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Remove Deployment Policy</DisplayName>
+ <ResourceId>/permission/admin/manage/removeDeploymentPolicy</ResourceId>
+ </ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Add Network Partition</DisplayName>
+ <ResourceId>/permission/protected/manage/addNetworkPartition</ResourceId>
+ </ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Update Network Partition</DisplayName>
+ <ResourceId>/permission/protected/manage/updateNetworkPartition</ResourceId>
+ </ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Get Network Partition</DisplayName>
+ <ResourceId>/permission/protected/manage/getNetworkPartitions</ResourceId>
+ </ManagementPermission>
+ <ManagementPermission>
+ <DisplayName>Remove Network Partition</DisplayName>
+ <ResourceId>/permission/protected/manage/removeNetworkPartition</ResourceId>
+ </ManagementPermission>
</ManagementPermissions>
</component>
http://git-wip-us.apache.org/repos/asf/stratos/blob/4dc650a4/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 057b390..1b847f5 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
@@ -169,7 +169,7 @@ public class StratosApiV41 extends AbstractApi {
@Path("/deploymentPolicies")
@Produces("application/json")
@Consumes("application/json")
- @AuthorizationAction("/permission/admin/manage/addCartridge")
+ @AuthorizationAction("/permission/admin/manage/addDeploymentPolicy")
public Response addDeploymentPolicy(DeploymentPolicyBean deploymentPolicyDefinitionBean)
throws RestAPIException {
@@ -195,7 +195,7 @@ public class StratosApiV41 extends AbstractApi {
@Path("/deploymentPolicies")
@Produces("application/json")
@Consumes("application/json")
- @AuthorizationAction("/permission/admin/manage/addCartridge")
+ @AuthorizationAction("/permission/admin/manage/updateDeploymentPolicy")
public Response updateDeploymentPolicy(DeploymentPolicyBean deploymentPolicyDefinitionBean)
throws RestAPIException {