You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/05/13 20:02:04 UTC
[73/96] [abbrv] git commit: updated refs/heads/ui-vpc-redesign to
9be3660
CLOUDSTACK-763: Removed unused methods
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14e992e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14e992e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14e992e9
Branch: refs/heads/ui-vpc-redesign
Commit: 14e992e95365ffefc8df37db63db9c76c92ff69f
Parents: 49fbff2
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue May 7 11:43:56 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon May 13 12:03:39 2013 +0530
----------------------------------------------------------------------
api/src/com/cloud/network/vpc/NetworkACL.java | 2 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 8 --------
server/src/com/cloud/network/vpc/NetworkACLVO.java | 11 +----------
3 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14e992e9/api/src/com/cloud/network/vpc/NetworkACL.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACL.java b/api/src/com/cloud/network/vpc/NetworkACL.java
index c5a0d6d..8bde7c2 100644
--- a/api/src/com/cloud/network/vpc/NetworkACL.java
+++ b/api/src/com/cloud/network/vpc/NetworkACL.java
@@ -20,7 +20,7 @@ package com.cloud.network.vpc;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.InternalIdentity;
-public interface NetworkACL extends InternalIdentity, ControlledEntity{
+public interface NetworkACL extends InternalIdentity{
public static final long DEFAULT_DENY = 1;
public static final long DEFAULT_ALLOW = 2;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14e992e9/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index ae9b8f9..570ba2b 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -76,8 +76,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
@Inject
NetworkACLItemDao _networkACLItemDao;
@Inject
- List<NetworkACLServiceProvider> _networkAclElements;
- @Inject
NetworkModel _networkModel;
@Inject
NetworkDao _networkDao;
@@ -221,9 +219,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
}
_accountMgr.checkAccess(caller, null, true, vpc);
- Account aclOwner = _accountMgr.getAccount(vpc.getAccountId());
- _accountMgr.checkAccess(aclOwner, SecurityChecker.AccessType.ModifyEntry, false, acl);
-
if(aclItemCmd.getNumber() != null){
if(_networkACLItemDao.findByAclAndNumber(aclId, aclItemCmd.getNumber()) != null){
throw new InvalidParameterValueException("ACL item with number "+aclItemCmd.getNumber()+" already exists in ACL: "+acl.getUuid());
@@ -435,9 +430,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
_accountMgr.checkAccess(caller, null, true, vpc);
- Account aclOwner = _accountMgr.getAccount(vpc.getAccountId());
- _accountMgr.checkAccess(aclOwner, SecurityChecker.AccessType.ModifyEntry, false, acl);
-
if(number != null){
//Check if ACL Item with specified number already exists
NetworkACLItemVO aclNumber = _networkACLItemDao.findByAclAndNumber(acl.getId(), number);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14e992e9/server/src/com/cloud/network/vpc/NetworkACLVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLVO.java b/server/src/com/cloud/network/vpc/NetworkACLVO.java
index 374ba15..ad2ffbf 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLVO.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLVO.java
@@ -41,7 +41,7 @@ public class NetworkACLVO implements NetworkACL{
@Column(name="description")
private String description;
- protected NetworkACLVO(){
+ public NetworkACLVO(){
}
protected NetworkACLVO(String name, String description, long vpcId){
@@ -76,13 +76,4 @@ public class NetworkACLVO implements NetworkACL{
return name;
}
- @Override
- public long getAccountId() {
- return 0; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- @Override
- public long getDomainId() {
- return 0; //To change body of implemented methods use File | Settings | File Templates.
- }
}