Alon Bar-Lev has uploaded a new change for review. Change subject: bll: move aaa related logics into aaa subpackage ......................................................................
bll: move aaa related logics into aaa subpackage Topic: AAA Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720 Change-Id: I2af38e5ea57b6753eb0c836d3dff03df74cdfdc9 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AdGroupsHandlingCommandBase.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddGroupCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddUserCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryEntryKey.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbGroupsQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbUsersQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserNameAndDomainQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryGroupByIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryUserByIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetValueBySessionQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginAdminUserCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginUserCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveUserCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SetDataOnSessionCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/UserCommandBase.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractGetEntitiesWithPermittedActionParametersQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/RemoveAdGroupCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/SessionDataContainerTest.java 41 files changed, 75 insertions(+), 54 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/30572/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 132d3c8..27cce95 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -25,6 +25,7 @@ import org.ovirt.engine.core.aaa.AuthenticationProfileRepository; import org.ovirt.engine.api.extensions.aaa.Acct; import org.ovirt.engine.core.aaa.AcctUtils; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.bll.attestationbroker.AttestThread; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.context.EngineContext; @@ -36,7 +37,6 @@ import org.ovirt.engine.core.bll.job.JobRepositoryCleanupManager; import org.ovirt.engine.core.bll.job.JobRepositoryFactory; import org.ovirt.engine.core.bll.quota.QuotaManager; -import org.ovirt.engine.core.bll.session.SessionDataContainer; import org.ovirt.engine.core.common.EngineWorkingMode; import org.ovirt.engine.core.common.action.LoginUserParameters; import org.ovirt.engine.core.common.action.LogoutUserParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 5f8b4a2..91ef413 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -20,6 +20,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.context.CompensationContext; import org.ovirt.engine.core.bll.context.DefaultCompensationContext; @@ -34,7 +35,6 @@ import org.ovirt.engine.core.bll.quota.QuotaManager; import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.quota.QuotaVdsDependent; -import org.ovirt.engine.core.bll.session.SessionDataContainer; import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; import org.ovirt.engine.core.bll.tasks.TaskManagerUtil; import org.ovirt.engine.core.bll.tasks.interfaces.Command; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java index bb12626..e18eae6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java @@ -30,6 +30,7 @@ "Can't find constructor for type {0} with parameter types: {1}"; private static final String[] COMMAND_PACKAGES = new String[] { "org.ovirt.engine.core.bll", + "org.ovirt.engine.core.bll.aaa", "org.ovirt.engine.core.bll.storage", "org.ovirt.engine.core.bll.lsm", "org.ovirt.engine.core.bll.gluster", "org.ovirt.engine.core.bll.network", "org.ovirt.engine.core.bll.network.dc", diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java index 3c67be9..24f7513 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java @@ -8,6 +8,7 @@ import javax.ejb.Singleton; import javax.ejb.Startup; +import org.ovirt.engine.core.bll.aaa.DbUserCacheManager; import org.ovirt.engine.core.bll.dwh.DwhHeartBeat; import org.ovirt.engine.core.bll.gluster.GlusterJobsManager; import org.ovirt.engine.core.bll.job.ExecutionHandler; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java index d6b3743..95e65a1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java @@ -6,9 +6,9 @@ import javax.validation.Validation; import javax.validation.Validator; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.bll.context.EngineContext; import org.ovirt.engine.core.bll.interfaces.BackendInternal; -import org.ovirt.engine.core.bll.session.SessionDataContainer; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index 0515273..e52d3b2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -10,7 +10,7 @@ import org.ovirt.engine.core.aaa.AuthenticationProfileRepository; import org.ovirt.engine.core.aaa.DirectoryGroup; import org.ovirt.engine.core.aaa.DirectoryUser; -import org.ovirt.engine.core.aaa.DirectoryUtils; +import org.ovirt.engine.core.bll.aaa.DirectoryUtils; import org.ovirt.engine.core.bll.quota.QuotaManager; import org.ovirt.engine.core.common.businessentities.AuditLog; import org.ovirt.engine.core.common.businessentities.DbGroup; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java index 6114da1..fedcd25 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java @@ -2,7 +2,7 @@ import org.ovirt.engine.core.bll.context.CommandContext; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.errors.VdcBllMessages; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AdGroupsHandlingCommandBase.java similarity index 96% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AdGroupsHandlingCommandBase.java index 9a4a495..928829f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AdGroupsHandlingCommandBase.java @@ -1,11 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.core.aaa.DirectoryGroup; -import org.ovirt.engine.core.aaa.DirectoryUtils; +import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.IdParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddGroupCommand.java similarity index 92% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddGroupCommand.java index bc82f07..0962e21 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddGroupCommand.java @@ -1,8 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; +import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddUserCommand.java similarity index 92% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddUserCommand.java index a1a4434..8df7d0d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/AddUserCommand.java @@ -1,8 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; +import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java similarity index 98% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java index 9297924..d1313ec 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.ArrayList; import java.util.HashMap; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DirectoryEntryKey.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryEntryKey.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DirectoryEntryKey.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryEntryKey.java index c3964a9..a2ed29a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DirectoryEntryKey.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryEntryKey.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import org.ovirt.engine.core.common.businessentities.DbUser; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java index 5ea5230..44e7fef 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.aaa; +package org.ovirt.engine.core.bll.aaa; import java.util.ArrayList; import java.util.Arrays; @@ -12,6 +12,10 @@ import org.ovirt.engine.api.extensions.aaa.Authz.GroupRecord; import org.ovirt.engine.api.extensions.aaa.Authz.PrincipalRecord; import org.ovirt.engine.api.extensions.aaa.Authz; +import org.ovirt.engine.core.aaa.AuthzUtils; +import org.ovirt.engine.core.aaa.DirectoryGroup; +import org.ovirt.engine.core.aaa.DirectoryUser; +import org.ovirt.engine.core.aaa.SearchQueryParsingUtils; import org.ovirt.engine.core.common.businessentities.DbGroup; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDbGroupsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbGroupsQuery.java similarity index 83% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDbGroupsQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbGroupsQuery.java index aff6af6..18d42f2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDbGroupsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbGroupsQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.dal.dbbroker.DbFacade; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDbUsersQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbUsersQuery.java similarity index 85% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDbUsersQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbUsersQuery.java index 8791219..7b647d5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDbUsersQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetAllDbUsersQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.dal.dbbroker.DbFacade; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDbUserByUserIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserIdQuery.java similarity index 85% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDbUserByUserIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserIdQuery.java index 4370cf5..5291239 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDbUserByUserIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserIdQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.dal.dbbroker.DbFacade; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDbUserByUserNameAndDomainQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserNameAndDomainQuery.java similarity index 87% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDbUserByUserNameAndDomainQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserNameAndDomainQuery.java index 601c450..4384901 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDbUserByUserNameAndDomainQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDbUserByUserNameAndDomainQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.GetDbUserByUserNameAndDomainQueryParameters; import org.ovirt.engine.core.dal.dbbroker.DbFacade; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryGroupByIdQuery.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryGroupByIdQuery.java index 08065b4..1ed3854 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryGroupByIdQuery.java @@ -1,10 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.List; import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.core.aaa.DirectoryGroup; -import org.ovirt.engine.core.aaa.DirectoryUtils; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryUserByIdQuery.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryUserByIdQuery.java index 503f4d2..6c1a4a2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryUserByIdQuery.java @@ -1,10 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.List; import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.core.aaa.DirectoryUser; -import org.ovirt.engine.core.aaa.DirectoryUtils; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserBySessionIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQuery.java similarity index 80% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserBySessionIdQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQuery.java index 6f7f7bd..bea224a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserBySessionIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQuery.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; public class GetUserBySessionIdQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetValueBySessionQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetValueBySessionQuery.java similarity index 87% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetValueBySessionQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetValueBySessionQuery.java index 4bb7dd9..1ae6624 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetValueBySessionQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetValueBySessionQuery.java @@ -1,6 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.queries.GetValueBySessionQueryParameters; public class GetValueBySessionQuery<P extends GetValueBySessionQueryParameters> extends QueriesCommandBase<P> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginAdminUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginAdminUserCommand.java similarity index 88% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginAdminUserCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginAdminUserCommand.java index 2f82c01..2f9e399 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginAdminUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginAdminUserCommand.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.common.action.LoginUserParameters; import org.ovirt.engine.core.common.errors.VdcBllMessages; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java similarity index 98% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java index 0a4f841..4f1692f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -14,18 +14,18 @@ import org.ovirt.engine.api.extensions.Base; import org.ovirt.engine.api.extensions.ExtMap; import org.ovirt.engine.api.extensions.aaa.Acct; -import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.api.extensions.aaa.Authn.AuthRecord; -import org.ovirt.engine.api.extensions.aaa.Authz; +import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.api.extensions.aaa.Authz.PrincipalRecord; +import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.api.extensions.aaa.Mapping; import org.ovirt.engine.core.aaa.AcctUtils; import org.ovirt.engine.core.aaa.AuthType; import org.ovirt.engine.core.aaa.AuthenticationProfile; import org.ovirt.engine.core.aaa.AuthenticationProfileRepository; import org.ovirt.engine.core.aaa.AuthzUtils; -import org.ovirt.engine.core.aaa.DirectoryUtils; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginUserCommand.java similarity index 72% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginUserCommand.java index ea5ee09..a9018a3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginUserCommand.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.common.action.LoginUserParameters; @NonTransactiveCommandAttribute diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutBySessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java similarity index 89% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutBySessionCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java index 0c738be..b726ee9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutBySessionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutBySessionCommand.java @@ -1,9 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.Backend; +import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.action.LogoutUserParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java similarity index 95% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java index 2b875a7..31c2ab3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutUserCommand.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; @@ -6,7 +6,7 @@ import org.ovirt.engine.api.extensions.Base; import org.ovirt.engine.api.extensions.ExtMap; import org.ovirt.engine.api.extensions.aaa.Authn; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.LogoutUserParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java similarity index 95% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java index d8f23d2..dd438fc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java @@ -1,5 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; +import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.action.PermissionsOperationsParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveUserCommand.java similarity index 95% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveUserCommand.java index 6ba73eb..4ba646e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveUserCommand.java @@ -1,8 +1,10 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; +import org.ovirt.engine.core.bll.MultiLevelAdministrationHandler; +import org.ovirt.engine.core.bll.PredefinedUsers; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java similarity index 99% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java index 778389a..c33d38d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.session; +package org.ovirt.engine.core.bll.aaa; import java.util.Date; import java.util.Iterator; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDataOnSessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SetDataOnSessionCommand.java similarity index 91% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDataOnSessionCommand.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SetDataOnSessionCommand.java index 56db614..88d0146 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetDataOnSessionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SetDataOnSessionCommand.java @@ -1,9 +1,9 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.action.SetDataOnSessionParameters; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SyncUsers.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SyncUsers.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java index d390b59..59b757f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SyncUsers.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +10,6 @@ import org.ovirt.engine.api.extensions.ExtMap; import org.ovirt.engine.core.aaa.AuthzUtils; -import org.ovirt.engine.core.aaa.DirectoryUtils; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.utils.collections.MultiValueMapUtils; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/UserCommandBase.java similarity index 97% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/UserCommandBase.java index ca1d5ef..7c88b26 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/UserCommandBase.java @@ -1,11 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import java.util.Collections; import java.util.List; import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.core.aaa.DirectoryUser; -import org.ovirt.engine.core.aaa.DirectoryUtils; +import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.action.IdParameters; import org.ovirt.engine.core.common.businessentities.DbUser; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidateSessionQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java similarity index 93% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidateSessionQuery.java rename to backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java index afbe8b3..a8bba3d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidateSessionQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java @@ -1,6 +1,6 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.utils.log.Log; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractGetEntitiesWithPermittedActionParametersQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractGetEntitiesWithPermittedActionParametersQueryTest.java index 9b7f995..067fa09 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractGetEntitiesWithPermittedActionParametersQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractGetEntitiesWithPermittedActionParametersQueryTest.java @@ -4,7 +4,7 @@ import org.junit.After; import org.junit.Before; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.queries.GetEntitiesWithPermittedActionParameters; import org.ovirt.engine.core.utils.RandomUtils; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java index 4a765c8..fc592f8 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.RandomStringUtils; import org.junit.After; import org.junit.Before; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java index e884a22..f3c310b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.bll.tasks.SPMAsyncTaskHandler; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.action.LockProperties; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java index b971082..6813b0f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java @@ -12,7 +12,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java index c82a51d..31651ad 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java @@ -1,10 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import org.junit.Test; +import org.ovirt.engine.core.bll.AbstractUserQueryTest; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetUserBySessionIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQueryTest.java similarity index 91% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetUserBySessionIdQueryTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQueryTest.java index 58c2a93..de2bf41 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetUserBySessionIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/GetUserBySessionIdQueryTest.java @@ -1,11 +1,11 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; import org.junit.After; import org.junit.Test; -import org.ovirt.engine.core.bll.session.SessionDataContainer; +import org.ovirt.engine.core.bll.AbstractUserQueryTest; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.utils.RandomUtils; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/RemoveAdGroupCommandTest.java similarity index 97% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/RemoveAdGroupCommandTest.java index 70f299c..9152c2c 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAdGroupCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/RemoveAdGroupCommandTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll; +package org.ovirt.engine.core.bll.aaa; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/SessionDataContainerTest.java similarity index 98% rename from backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java rename to backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/SessionDataContainerTest.java index fa2fc69..8525367 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/SessionDataContainerTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.session; +package org.ovirt.engine.core.bll.aaa; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -- To view, visit http://gerrit.ovirt.org/30572 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2af38e5ea57b6753eb0c836d3dff03df74cdfdc9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
