cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [2/5] git commit: updated refs/heads/rbac to 2543fbe
Date Thu, 26 Dec 2013 23:23:46 GMT
Fixing the issues in loading the beans


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7c3411b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7c3411b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7c3411b

Branch: refs/heads/rbac
Commit: b7c3411be9795b51e0184119eb13b8f77c21e068
Parents: 337e33a
Author: Prachi Damle <prachi@cloud.com>
Authored: Thu Dec 26 15:02:59 2013 -0800
Committer: Prachi Damle <prachi@cloud.com>
Committed: Thu Dec 26 15:17:10 2013 -0800

----------------------------------------------------------------------
 ...g-acl-role-based-access-checkers-context.xml |  2 +-
 .../com/cloud/api/query/vo/AclGroupJoinVO.java  | 36 --------------------
 2 files changed, 1 insertion(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7c3411b/plugins/acl/role-based-access-checkers/resources/META-INF/cloudstack/acl-role-based-access-checkers/spring-acl-role-based-access-checkers-context.xml
----------------------------------------------------------------------
diff --git a/plugins/acl/role-based-access-checkers/resources/META-INF/cloudstack/acl-role-based-access-checkers/spring-acl-role-based-access-checkers-context.xml
b/plugins/acl/role-based-access-checkers/resources/META-INF/cloudstack/acl-role-based-access-checkers/spring-acl-role-based-access-checkers-context.xml
index b7f06aa..78b233d 100644
--- a/plugins/acl/role-based-access-checkers/resources/META-INF/cloudstack/acl-role-based-access-checkers/spring-acl-role-based-access-checkers-context.xml
+++ b/plugins/acl/role-based-access-checkers/resources/META-INF/cloudstack/acl-role-based-access-checkers/spring-acl-role-based-access-checkers-context.xml
@@ -27,6 +27,6 @@
                       http://www.springframework.org/schema/context/spring-context-3.0.xsd"
                       >                     
 
-    <bean id="roleBasedEntityAccessChecker" class="org.apache.cloudstack.acl.entity.RoleBasedEntityAccessChecker"
/>
+    <bean id="RoleBasedEntityAccessChecker" class="org.apache.cloudstack.acl.entity.RoleBasedEntityAccessChecker"
/>
 
 </beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7c3411b/server/src/com/cloud/api/query/vo/AclGroupJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/AclGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AclGroupJoinVO.java
index e4ba3d9..dd61756 100644
--- a/server/src/com/cloud/api/query/vo/AclGroupJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/AclGroupJoinVO.java
@@ -28,7 +28,6 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 import org.apache.cloudstack.acl.AclEntityType;
-import org.apache.cloudstack.acl.PermissionScope;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 
 import com.cloud.utils.db.GenericDao;
@@ -98,22 +97,6 @@ public class AclGroupJoinVO extends BaseViewVO implements ControlledViewEntity
{
     @Column(name = "member_account_name")
     private String memberAccountName;
 
-    @Column(name = "permission_action")
-    private String permissionAction;
-
-    @Column(name = "permission_entity_type")
-    private String permissionEntityType;
-
-    @Column(name = "permission_scope_id")
-    private long permissionScopeId;
-
-    @Column(name = "permission_scope_type")
-    @Enumerated(value = EnumType.STRING)
-    PermissionScope permissionScope;
-
-    @Column(name = "permission_access_type")
-    @Enumerated(value = EnumType.STRING)
-    AccessType permissionAccessType;
 
     public AclGroupJoinVO() {
     }
@@ -222,25 +205,6 @@ public class AclGroupJoinVO extends BaseViewVO implements ControlledViewEntity
{
         return memberAccountName;
     }
 
-    public String getPermissionAction() {
-        return permissionAction;
-    }
-
-    public String getPermissionEntityType() {
-        return permissionEntityType;
-    }
-
-    public long getPermissionScopeId() {
-        return permissionScopeId;
-    }
-
-    public PermissionScope getPermissionScope() {
-        return permissionScope;
-    }
-
-    public AccessType getPermissionAccessType() {
-        return permissionAccessType;
-    }
 
     @Override
     public AclEntityType getEntityType() {


Mime
View raw message