Updated Branches: refs/heads/rbac 8c15e6165 -> bcd4cdd29
Fix compilation issue due to method rename. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bcd4cdd2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bcd4cdd2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bcd4cdd2 Branch: refs/heads/rbac Commit: bcd4cdd29523fd15339dabf1ee8a8178fa8ae573 Parents: 8c15e61 Author: Min Chen <min.c...@citrix.com> Authored: Wed Oct 2 14:14:25 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Wed Oct 2 14:14:25 2013 -0700 ---------------------------------------------------------------------- .../api/command/admin/acl/GrantPermissionToAclRoleCmd.java | 2 +- .../api/command/admin/acl/RevokePermissionFromAclRoleCmd.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcd4cdd2/api/src/org/apache/cloudstack/api/command/admin/acl/GrantPermissionToAclRoleCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/GrantPermissionToAclRoleCmd.java b/api/src/org/apache/cloudstack/api/command/admin/acl/GrantPermissionToAclRoleCmd.java index a93e790..c0c0083 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/acl/GrantPermissionToAclRoleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/acl/GrantPermissionToAclRoleCmd.java @@ -92,7 +92,7 @@ public class GrantPermissionToAclRoleCmd extends BaseAsyncCmd { public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException { CallContext.current().setEventDetails("Acl role Id: " + getId()); - AclRole result = _aclService.grantPermissionToAclRole(id, apiList); + AclRole result = _aclService.grantApiPermissionToAclRole(id, apiList); if (result != null) { AclRoleResponse response = _responseGenerator.createAclRoleResponse(result); response.setResponseName(getCommandName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcd4cdd2/api/src/org/apache/cloudstack/api/command/admin/acl/RevokePermissionFromAclRoleCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/acl/RevokePermissionFromAclRoleCmd.java b/api/src/org/apache/cloudstack/api/command/admin/acl/RevokePermissionFromAclRoleCmd.java index 68db118..4576b76 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/acl/RevokePermissionFromAclRoleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/acl/RevokePermissionFromAclRoleCmd.java @@ -92,7 +92,7 @@ public class RevokePermissionFromAclRoleCmd extends BaseAsyncCmd { public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException { CallContext.current().setEventDetails("Acl role Id: " + getId()); - AclRole result = _aclService.revokePermissionFromAclRole(id, apiList); + AclRole result = _aclService.revokeApiPermissionFromAclRole(id, apiList); if (result != null) { AclRoleResponse response = _responseGenerator.createAclRoleResponse(result); response.setResponseName(getCommandName());