apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the issues in loading the beans

Browse Source
This commit is contained in:
Prachi Damle 2013-12-26 15:02:59 -08:00
parent 337e33a014
commit b7c3411be9
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/acl/role-based-access-checkers/resources/META-INF/cloudstack/acl-role-based-access-checkers/spring-acl-role-based-access-checkers-context.xml
View File

@ -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>

36
server/src/com/cloud/api/query/vo/AclGroupJoinVO.java
View File

@ -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() {