cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [3/3] git commit: updated refs/heads/rbac to e5d7226
Date Mon, 03 Mar 2014 00:15:25 GMT
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 <min.chen@citrix.com>
Authored: Sun Mar 2 16:06:29 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
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);
     }


Mime
View raw message