Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1582C107F3 for ; Mon, 3 Mar 2014 00:15:32 +0000 (UTC) Received: (qmail 98946 invoked by uid 500); 3 Mar 2014 00:15:28 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 98771 invoked by uid 500); 3 Mar 2014 00:15:25 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 98693 invoked by uid 99); 3 Mar 2014 00:15:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 00:15:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 513CE932F93; Mon, 3 Mar 2014 00:15:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Mon, 03 Mar 2014 00:15:25 -0000 Message-Id: <63dea3f139d74019bfe8ac4c2207e963@git.apache.org> In-Reply-To: <9576eeefd6834f6fbf543481451a1b80@git.apache.org> References: <9576eeefd6834f6fbf543481451a1b80@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/rbac to e5d7226 Rename IAMEntityType.AclGroup and AclPolicy. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5d72265 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5d72265 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5d72265 Branch: refs/heads/rbac Commit: e5d722654abea1ac97d7ad3a710e86939a4e074e Parents: 7e4c3b0 Author: Min Chen Authored: Sun Mar 2 16:06:29 2014 -0800 Committer: Min Chen Committed: Sun Mar 2 16:06:29 2014 -0800 ---------------------------------------------------------------------- api/src/org/apache/cloudstack/acl/IAMEntityType.java | 4 ++-- .../plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5d72265/api/src/org/apache/cloudstack/acl/IAMEntityType.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/acl/IAMEntityType.java b/api/src/org/apache/cloudstack/acl/IAMEntityType.java index 0a44253..9299ae9 100644 --- a/api/src/org/apache/cloudstack/acl/IAMEntityType.java +++ b/api/src/org/apache/cloudstack/acl/IAMEntityType.java @@ -38,8 +38,8 @@ public enum IAMEntityType { PortForwardingRule, Event, AsyncJob, - AclPolicy, - AclGroup, + IAMPolicy, + IAMGroup, MonitorService, SSLCert } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5d72265/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java index 945f48e..42c1adc 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java +++ b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java @@ -182,8 +182,8 @@ public class IAMApiServiceImpl extends ManagerBase implements IAMApiService, Man s_typeMap.put(IAMEntityType.PortForwardingRule, PortForwardingRuleVO.class); s_typeMap.put(IAMEntityType.Event, EventVO.class); s_typeMap.put(IAMEntityType.AsyncJob, AsyncJobVO.class); - s_typeMap.put(IAMEntityType.AclGroup, IAMGroupVO.class); - s_typeMap.put(IAMEntityType.AclPolicy, IAMPolicyVO.class); + s_typeMap.put(IAMEntityType.IAMGroup, IAMGroupVO.class); + s_typeMap.put(IAMEntityType.IAMPolicy, IAMPolicyVO.class); s_typeMap.put(IAMEntityType.MonitorService, MonitoringServiceVO.class); s_typeMap.put(IAMEntityType.SSLCert, SslCertVO.class); }