Yair Zaslavsky has uploaded a new change for review. Change subject: core: Moving Id encoding classes to authentication module. ......................................................................
core: Moving Id encoding classes to authentication module. In order to be able to use the Id encoding classes at the Ldap profile, the relevant classes must be moved to the authentication module. In addition, added a dependency of bll on the authentication module - this might be an interim step eventually Change-Id: Icfebc7212c1817fa7d57b0414366d989e1d5a61c Signed-off-by: Yair Zaslavsky <[email protected]> --- R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/ADLdapIdEncoder.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultIdEncoder.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultLdapIdEncoder.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/LdapIdEncoder.java R backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/RHDSLdapIdEncoder.java M backend/manager/modules/bll/pom.xml M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryExecutionFormatterBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadata.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataImpl.java 10 files changed, 18 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/22704/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapIdEncoder.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/ADLdapIdEncoder.java similarity index 94% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapIdEncoder.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/ADLdapIdEncoder.java index 6619cd1..e288f29 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapIdEncoder.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/ADLdapIdEncoder.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.adbroker; +package org.ovirt.engine.core.authentication.ldap.query; import org.ovirt.engine.core.common.utils.ExternalId; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultIdEncoder.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultIdEncoder.java similarity index 84% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultIdEncoder.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultIdEncoder.java index d4b3d13..7f926bc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultIdEncoder.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultIdEncoder.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.adbroker; +package org.ovirt.engine.core.authentication.ldap.query; import org.ovirt.engine.core.common.utils.ExternalId; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultLdapIdEncoder.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultLdapIdEncoder.java similarity index 90% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultLdapIdEncoder.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultLdapIdEncoder.java index 48413a2..2878457 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DefaultLdapIdEncoder.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/DefaultLdapIdEncoder.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.adbroker; +package org.ovirt.engine.core.authentication.ldap.query; import org.ovirt.engine.core.common.utils.ExternalId; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapIdEncoder.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/LdapIdEncoder.java similarity index 70% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapIdEncoder.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/LdapIdEncoder.java index cdadb9b..6fda831 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapIdEncoder.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/LdapIdEncoder.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.adbroker; +package org.ovirt.engine.core.authentication.ldap.query; import org.ovirt.engine.core.common.utils.ExternalId; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapIdEncoder.java b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/RHDSLdapIdEncoder.java similarity index 94% rename from backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapIdEncoder.java rename to backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/RHDSLdapIdEncoder.java index db102f5..b5ae6f6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapIdEncoder.java +++ b/backend/manager/modules/authentication/src/main/java/org/ovirt/engine/core/authentication/ldap/query/RHDSLdapIdEncoder.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.bll.adbroker; +package org.ovirt.engine.core.authentication.ldap.query; import org.ovirt.engine.core.common.utils.ExternalId; import org.ovirt.engine.core.compat.Guid; diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index 690f5e6..7879f50 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -30,6 +30,12 @@ <artifactId>common</artifactId> <version>${engine.version}</version> </dependency> + + <dependency> + <groupId>${engine.groupId}</groupId> + <artifactId>authentication</artifactId> + <version>${engine.version}</version> + </dependency> <dependency> <groupId>${engine.groupId}</groupId> diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryExecutionFormatterBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryExecutionFormatterBase.java index 46f7377..19a6666 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryExecutionFormatterBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryExecutionFormatterBase.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll.adbroker; +import org.ovirt.engine.core.authentication.ldap.query.LdapIdEncoder; import org.ovirt.engine.core.common.utils.ExternalId; public abstract class LdapQueryExecutionFormatterBase implements LdapQueryFormatter<LdapQueryExecution> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadata.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadata.java index bf0e1a5..a0db1ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadata.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadata.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll.adbroker; +import org.ovirt.engine.core.authentication.ldap.query.LdapIdEncoder; import org.springframework.ldap.core.ContextMapper; public interface LdapQueryMetadata { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java index af24fa3..0ac6bf5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java @@ -6,6 +6,10 @@ import javax.naming.directory.SearchControls; +import org.ovirt.engine.core.authentication.ldap.query.ADLdapIdEncoder; +import org.ovirt.engine.core.authentication.ldap.query.DefaultIdEncoder; +import org.ovirt.engine.core.authentication.ldap.query.DefaultLdapIdEncoder; +import org.ovirt.engine.core.authentication.ldap.query.RHDSLdapIdEncoder; import org.ovirt.engine.core.ldap.LdapProviderType; public class LdapQueryMetadataFactoryImpl implements LdapQueryMetadataFactory { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataImpl.java index 22f934f..28080e9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataImpl.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll.adbroker; +import org.ovirt.engine.core.authentication.ldap.query.LdapIdEncoder; import org.springframework.ldap.core.ContextMapper; public class LdapQueryMetadataImpl implements LdapQueryMetadata { -- To view, visit http://gerrit.ovirt.org/22704 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfebc7212c1817fa7d57b0414366d989e1d5a61c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
