Martin Peřina has uploaded a new change for review. Change subject: core: Move LdapUser and LdapGroup to kerberosldap extension ......................................................................
core: Move LdapUser and LdapGroup to kerberosldap extension Moves LdapUser and LdapGroup into legacy kerberosldap extension, because we don't user those classes ouside kerberosldap extensions no more. Change-Id: Ic57378c0d560ba41e8d3d70f0ebbc6743ec714b7 Topic: AAA Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GroupSearchResult.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGetAdUserByUserNameCommand.java R backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGroup.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchGroupsByQueryCommand.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchUserByQueryCommand.java R backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapUser.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/UserAuthenticationResult.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml 16 files changed, 4 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/37891/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java index 3af30eb..e4cc32e 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ADUserContextMapper.java @@ -22,7 +22,6 @@ import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.compat.Guid; public class ADUserContextMapper implements ContextMapper { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GroupSearchResult.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GroupSearchResult.java index 4f60bb1..d399aec 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GroupSearchResult.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/GroupSearchResult.java @@ -3,8 +3,6 @@ import java.util.Collections; import java.util.List; -import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; - /** * Contains search result information for directory groups. */ diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java index 72730de..3a1b392 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPAUserContextMapper.java @@ -22,7 +22,6 @@ import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.compat.Guid; public class IPAUserContextMapper implements ContextMapper { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java index 251ae55..0df95c4 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/ITDSUserContextMapper.java @@ -17,7 +17,6 @@ import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.compat.Guid; public class ITDSUserContextMapper implements ContextMapper { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java index b2634fa..6dd0aec 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java @@ -15,8 +15,6 @@ import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.api.extensions.aaa.Authz.QueryFilterRecord; -import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; /** * This directory implementation is a bridge between the new directory interfaces and the existing LDAP infrastructure. diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java index e998967..1556f43 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapAuthenticateUserCommand.java @@ -5,7 +5,6 @@ import org.ovirt.engine.api.extensions.ExtMap; import org.ovirt.engine.api.extensions.aaa.Authn; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; public class LdapAuthenticateUserCommand extends LdapBrokerCommandBase { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java index dc4bc47..07287f1 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapBrokerCommandBase.java @@ -11,8 +11,6 @@ import org.slf4j.LoggerFactory; import org.ovirt.engine.api.extensions.aaa.Authn; -import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.extensions.aaa.builtin.kerberosldap.utils.kerberos.AuthenticationResult; diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGetAdUserByUserNameCommand.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGetAdUserByUserNameCommand.java index f057284..e3b5e80 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGetAdUserByUserNameCommand.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGetAdUserByUserNameCommand.java @@ -1,7 +1,5 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; - public class LdapGetAdUserByUserNameCommand extends LdapBrokerCommandBase { private String getUserName() { return ((LdapSearchByUserNameParameters) getParameters()).getUserName(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapGroup.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGroup.java similarity index 95% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapGroup.java rename to backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGroup.java index 9d1538a..7a16fee 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapGroup.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapGroup.java @@ -1,9 +1,10 @@ -package org.ovirt.engine.core.common.businessentities.aaa; +package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; import java.util.ArrayList; import java.util.List; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; +import org.ovirt.engine.core.common.businessentities.aaa.DbGroup; import org.ovirt.engine.core.common.utils.ObjectUtils; public class LdapGroup extends IVdcQueryable { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchGroupsByQueryCommand.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchGroupsByQueryCommand.java index 0f61be5..3f773e4 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchGroupsByQueryCommand.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchGroupsByQueryCommand.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.core.common.businessentities.aaa.LdapGroup; - public class LdapSearchGroupsByQueryCommand extends LdapWithConfiguredCredentialsCommandBase { protected LdapQueryData getLdapQueryData() { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchUserByQueryCommand.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchUserByQueryCommand.java index 6b0515d..fbce959 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchUserByQueryCommand.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapSearchUserByQueryCommand.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.List; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; - public class LdapSearchUserByQueryCommand extends LdapSearchGroupsByQueryCommand { private boolean populateGroups; private boolean populateGroupsRecursively; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapUser.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapUser.java similarity index 96% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapUser.java rename to backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapUser.java index 4d1042c..beaa61a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapUser.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapUser.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.common.businessentities.aaa; +package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; import java.io.Serializable; import java.util.HashMap; @@ -6,6 +6,7 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; +import org.ovirt.engine.core.common.businessentities.aaa.DbUser; import org.ovirt.engine.core.compat.StringHelper; public class LdapUser extends IVdcQueryable implements Serializable { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java index 24b624e..3750489 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/OpenLdapUserContextMapper.java @@ -21,7 +21,6 @@ import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.compat.Guid; public class OpenLdapUserContextMapper implements ContextMapper { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java index b041e76..0fc6b88 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/RHDSUserContextMapper.java @@ -22,7 +22,6 @@ import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.compat.Guid; public class RHDSUserContextMapper implements ContextMapper { diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/UserAuthenticationResult.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/UserAuthenticationResult.java index 9085298..7720a45 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/UserAuthenticationResult.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/UserAuthenticationResult.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; -import org.ovirt.engine.core.common.businessentities.aaa.LdapUser; import org.ovirt.engine.core.common.errors.VdcBllMessages; public class UserAuthenticationResult { diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml index 7dacd4e..beaeb3b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml @@ -17,8 +17,6 @@ <include name="common/businessentities/aaa/AuthzGroup.java" /> <include name="common/businessentities/aaa/DbGroup.java" /> <include name="common/businessentities/aaa/DbUser.java" /> - <include name="common/businessentities/aaa/LdapGroup.java" /> - <include name="common/businessentities/aaa/LdapUser.java" /> <include name="aaa/AuthType.java" /> <include name="aaa/DirectoryEntry.java" /> <include name="aaa/ProfileEntry.java" /> -- To view, visit http://gerrit.ovirt.org/37891 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic57378c0d560ba41e8d3d70f0ebbc6743ec714b7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
