Yair Zaslavsky has uploaded a new change for review.
Change subject: core: Moved DomainsPasswordMap to utils
......................................................................
core: Moved DomainsPasswordMap to utils
Not only dal uses this , but also vdsbroker and bll.
It has no db specific code, but rather depeneds on encrypt utils
which is part of utils.
Change-Id: Iaa7b65e62f9dd6a1bf3557631558715e5ca18d46
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
R
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/DomainsPasswordMap.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
4 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/25506/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java
index 6e36d64..787b256 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/UsersDomainsCacheManagerService.java
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.EnumUtils;
-import org.ovirt.engine.core.dal.dbbroker.generic.DomainsPasswordMap;
+import org.ovirt.engine.core.utils.collections.DomainsPasswordMap;
import org.ovirt.engine.core.ldap.LdapProviderType;
import org.ovirt.engine.core.ldap.LdapSRVLocator;
import org.ovirt.engine.core.utils.dns.DnsSRVLocator.DnsSRVResult;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
index 69c9fcd..5acaba3 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
@@ -21,6 +21,7 @@
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.utils.serialization.json.JsonObjectDeserializer;
+import org.ovirt.engine.core.utils.collections.DomainsPasswordMap;
public class DBConfigUtils extends ConfigUtilsBase {
private static final Map<String, Map<String, Object>> _vdcOptionCache =
new HashMap<String, Map<String, Object>>();
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/DomainsPasswordMap.java
similarity index 97%
rename from
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java
rename to
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/DomainsPasswordMap.java
index 62b4767..5ae213e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/DomainsPasswordMap.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.dal.dbbroker.generic;
+package org.ovirt.engine.core.utils.collections;
import java.util.Collection;
import java.util.Collections;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
index 9807734..bdebc32 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
-import org.ovirt.engine.core.dal.dbbroker.generic.DomainsPasswordMap;
+import org.ovirt.engine.core.utils.collections.DomainsPasswordMap;
import org.ovirt.engine.core.utils.FileUtil;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
--
To view, visit http://gerrit.ovirt.org/25506
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa7b65e62f9dd6a1bf3557631558715e5ca18d46
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
