diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/api/RoleBasedAPIAccessChecker.java b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java similarity index 95% rename from services/iam/plugin/src/org/apache/cloudstack/acl/api/RoleBasedAPIAccessChecker.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java index 23f25ca1254..3e901744e8b 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/acl/api/RoleBasedAPIAccessChecker.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedAPIAccessChecker.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.acl.api; +package org.apache.cloudstack.acl; import java.util.List; @@ -24,7 +24,8 @@ import javax.inject.Inject; import org.apache.cloudstack.acl.APIChecker; import org.apache.cloudstack.acl.AclPolicy; import org.apache.cloudstack.acl.AclRole; -import org.apache.cloudstack.acl.AclService; +import org.apache.cloudstack.acl.api.AclApiService; + import org.apache.log4j.Logger; import com.cloud.exception.PermissionDeniedException; @@ -41,7 +42,7 @@ public class RoleBasedAPIAccessChecker extends AdapterBase implements APIChecker protected static final Logger s_logger = Logger.getLogger(RoleBasedAPIAccessChecker.class); @Inject AccountService _accountService; - @Inject AclService _aclService; + @Inject AclApiService _aclService; protected RoleBasedAPIAccessChecker() { super(); diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityAccessChecker.java similarity index 97% rename from services/iam/plugin/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityAccessChecker.java index c057bc02a91..6b9433be25a 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityAccessChecker.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.acl.entity; +package org.apache.cloudstack.acl; import java.util.ArrayList; import java.util.HashMap; @@ -24,11 +24,11 @@ import javax.inject.Inject; import org.apache.cloudstack.acl.AclPolicy; import org.apache.cloudstack.acl.AclPolicyPermissionVO; -import org.apache.cloudstack.acl.AclService; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.AclEntityType; import org.apache.cloudstack.acl.PermissionScope; import org.apache.cloudstack.acl.SecurityChecker; +import org.apache.cloudstack.acl.api.AclApiService; import org.apache.cloudstack.acl.dao.AclGroupAccountMapDao; import org.apache.cloudstack.acl.dao.AclPolicyPermissionDao; import org.apache.log4j.Logger; @@ -47,7 +47,7 @@ public class RoleBasedEntityAccessChecker extends DomainChecker implements Secur @Inject AccountService _accountService; @Inject - AclService _aclService; + AclApiService _aclService; @Inject DomainDao _domainDao; diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/entity/RoleBasedEntityQuerySelector.java b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityQuerySelector.java similarity index 98% rename from services/iam/plugin/src/org/apache/cloudstack/acl/entity/RoleBasedEntityQuerySelector.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityQuerySelector.java index bf84a3460d3..e32b2d163d1 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/acl/entity/RoleBasedEntityQuerySelector.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/RoleBasedEntityQuerySelector.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.acl.entity; +package org.apache.cloudstack.acl; import java.util.ArrayList; import java.util.List; diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/AclService.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiService.java similarity index 85% rename from services/iam/plugin/src/org/apache/cloudstack/acl/AclService.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiService.java index 889a0d3b783..d02dd535fdd 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/acl/AclService.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiService.java @@ -14,15 +14,20 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.acl; +package org.apache.cloudstack.acl.api; import java.util.List; +import org.apache.cloudstack.acl.AclGroup; +import org.apache.cloudstack.acl.AclPolicy; +import org.apache.cloudstack.acl.AclPolicyPermission; +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.acl.PermissionScope; import org.apache.cloudstack.acl.AclPolicyPermission.Permission; import com.cloud.user.Account; -public interface AclService { +public interface AclApiService { /* ACL group related interfaces */ AclGroup createAclGroup(Account caller, String aclGroupName, String description); diff --git a/services/iam/plugin/src/org/apache/cloudstack/acl/AclServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java similarity index 95% rename from services/iam/plugin/src/org/apache/cloudstack/acl/AclServiceImpl.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java index 628672e90ae..468e087db05 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/acl/AclServiceImpl.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/AclApiServiceImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.acl; +package org.apache.cloudstack.acl.api; import java.util.ArrayList; import java.util.HashMap; @@ -25,6 +25,17 @@ import javax.inject.Inject; import org.apache.log4j.Logger; +import org.apache.cloudstack.acl.AclGroup; +import org.apache.cloudstack.acl.AclGroupAccountMapVO; +import org.apache.cloudstack.acl.AclGroupPolicyMapVO; +import org.apache.cloudstack.acl.AclGroupVO; +import org.apache.cloudstack.acl.AclPolicy; +import org.apache.cloudstack.acl.AclPolicyPermission; +import org.apache.cloudstack.acl.AclPolicyPermissionVO; +import org.apache.cloudstack.acl.AclPolicyVO; +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.acl.PermissionScope; +import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.acl.AclPolicyPermission.Permission; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.acl.dao.AclGroupAccountMapDao; @@ -62,10 +73,10 @@ import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; -@Local(value = {AclService.class}) -public class AclServiceImpl extends ManagerBase implements AclService, Manager { +@Local(value = {AclApiService.class}) +public class AclApiServiceImpl extends ManagerBase implements AclApiService, Manager { - public static final Logger s_logger = Logger.getLogger(AclServiceImpl.class); + public static final Logger s_logger = Logger.getLogger(AclApiServiceImpl.class); private String _name; @Inject diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/AddAccountToAclGroupCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AddAccountToAclGroupCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/AddAccountToAclGroupCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AddAccountToAclGroupCmd.java index c8289daabdf..47d9b3f6ff8 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/AddAccountToAclGroupCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AddAccountToAclGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import java.util.List; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/AddAclPermissionToAclPolicyCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AddAclPermissionToAclPolicyCmd.java similarity index 99% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/AddAclPermissionToAclPolicyCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AddAclPermissionToAclPolicyCmd.java index ea3736c540d..73deaf2c8fa 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/AddAclPermissionToAclPolicyCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AddAclPermissionToAclPolicyCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/AttachAclPolicyToAclGroupCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AttachAclPolicyToAclGroupCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/AttachAclPolicyToAclGroupCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AttachAclPolicyToAclGroupCmd.java index 719950e682d..db543ee48c0 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/AttachAclPolicyToAclGroupCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/AttachAclPolicyToAclGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import java.util.List; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/CreateAclGroupCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/CreateAclGroupCmd.java similarity index 99% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/CreateAclGroupCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/CreateAclGroupCmd.java index 3654d0d1295..60294cd53b0 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/CreateAclGroupCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/CreateAclGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/CreateAclPolicyCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/CreateAclPolicyCmd.java similarity index 99% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/CreateAclPolicyCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/CreateAclPolicyCmd.java index 6628a82f971..2aaa38a4393 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/CreateAclPolicyCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/CreateAclPolicyCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/DeleteAclGroupCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/DeleteAclGroupCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/DeleteAclGroupCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/DeleteAclGroupCmd.java index 110c1b528fa..939a501662c 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/DeleteAclGroupCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/DeleteAclGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/DeleteAclPolicyCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/DeleteAclPolicyCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/DeleteAclPolicyCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/DeleteAclPolicyCmd.java index 06df62f4187..ea0a39f6a3e 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/DeleteAclPolicyCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/DeleteAclPolicyCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/ListAclGroupsCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/ListAclGroupsCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/ListAclGroupsCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/ListAclGroupsCmd.java index e6f732c0633..9bb9f02cf14 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/ListAclGroupsCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/ListAclGroupsCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/ListAclPoliciesCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/ListAclPoliciesCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/ListAclPoliciesCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/ListAclPoliciesCmd.java index 5a99da0d045..9937187c99f 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/ListAclPoliciesCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/ListAclPoliciesCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAccountFromAclGroupCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAccountFromAclGroupCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAccountFromAclGroupCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAccountFromAclGroupCmd.java index 8d8d28a7673..96cbbd633de 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAccountFromAclGroupCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAccountFromAclGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import java.util.List; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAclPermissionFromAclPolicyCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAclPermissionFromAclPolicyCmd.java similarity index 99% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAclPermissionFromAclPolicyCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAclPermissionFromAclPolicyCmd.java index dc8ff33e9b9..f741e789ad7 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAclPermissionFromAclPolicyCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAclPermissionFromAclPolicyCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import org.apache.log4j.Logger; diff --git a/services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAclPolicyFromAclGroupCmd.java b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAclPolicyFromAclGroupCmd.java similarity index 98% rename from services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAclPolicyFromAclGroupCmd.java rename to services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAclPolicyFromAclGroupCmd.java index 39958c0466b..b7d61b616a4 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/api/command/RemoveAclPolicyFromAclGroupCmd.java +++ b/services/iam/plugin/src/org/apache/cloudstack/acl/api/command/RemoveAclPolicyFromAclGroupCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.iam.api.command; +package org.apache.cloudstack.acl.api.command; import java.util.List;