Allon Mureinik has uploaded a new change for review.
Change subject: core: Introducing the comperators package
......................................................................
core: Introducing the comperators package
org.ovirt.engine.core.common.businessentities includes several
comperators, which aren't really business entities on their own right.
This patch introduces the package
org.ovirt.engine.core.common.businessentities.comperators and moves
those comperators there, in order to make the project's organization
more straightforward.
Following patches will move additional comperators there, from other
sub-projects.
Change-Id: I70f2432df8338c736d9ab0e6c97e38acf3ddf92f
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTopSizeVmsFromStorageDomainQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRelatedToQuotaIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityComparator.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityGuidComparator.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/ImagesComparerByName.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/InterfaceComparerByMAC.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmTemplateComparerByDiskSize.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparer.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparerByDiskSize.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoDbFacadeImpl.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
21 files changed, 37 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/14192/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
index a4495c2..d16b99b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
@@ -12,7 +12,7 @@
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
-import org.ovirt.engine.core.common.businessentities.VmsComparer;
+import org.ovirt.engine.core.common.businessentities.comperators.VmsComparer;
import
org.ovirt.engine.core.common.vdscommands.SetVmStatusVDSCommandParameters;
import
org.ovirt.engine.core.common.vdscommands.UpdateVdsVMsClearedVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTopSizeVmsFromStorageDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTopSizeVmsFromStorageDomainQuery.java
index 56087e3..c516dcb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTopSizeVmsFromStorageDomainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTopSizeVmsFromStorageDomainQuery.java
@@ -3,9 +3,9 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.ImagesComparerByName;
import org.ovirt.engine.core.common.businessentities.VM;
-import org.ovirt.engine.core.common.businessentities.VmsComparerByDiskSize;
+import
org.ovirt.engine.core.common.businessentities.comperators.ImagesComparerByName;
+import
org.ovirt.engine.core.common.businessentities.comperators.VmsComparerByDiskSize;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import
org.ovirt.engine.core.common.queries.StorageDomainQueryTopSizeVmsParameters;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java
index 6eaad00..644bc7e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java
@@ -3,8 +3,8 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.ImagesComparerByName;
import org.ovirt.engine.core.common.businessentities.VM;
+import
org.ovirt.engine.core.common.businessentities.comperators.ImagesComparerByName;
import
org.ovirt.engine.core.common.queries.GetUserVmsByUserIdAndGroupsParameters;
public class GetUserVmsByUserIdAndGroupsQuery<P extends
GetUserVmsByUserIdAndGroupsParameters> extends QueriesCommandBase<P> {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
index fb1a627..7601e3e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
@@ -3,9 +3,9 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.ImagesComparerByName;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import
org.ovirt.engine.core.common.businessentities.VmTemplateComparerByDiskSize;
+import
org.ovirt.engine.core.common.businessentities.comperators.ImagesComparerByName;
+import
org.ovirt.engine.core.common.businessentities.comperators.VmTemplateComparerByDiskSize;
import org.ovirt.engine.core.common.queries.StorageDomainQueryParametersBase;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRelatedToQuotaIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRelatedToQuotaIdQuery.java
index c880ebd..ec80118 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRelatedToQuotaIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRelatedToQuotaIdQuery.java
@@ -3,8 +3,8 @@
import java.util.Collections;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.ImagesComparerByName;
import org.ovirt.engine.core.common.businessentities.VM;
+import
org.ovirt.engine.core.common.businessentities.comperators.ImagesComparerByName;
import
org.ovirt.engine.core.common.queries.GetEntitiesRelatedToQuotaIdParameters;
public class GetVmsRelatedToQuotaIdQuery<P extends
GetEntitiesRelatedToQuotaIdParameters>
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
index 2ed6633..1b8bac2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
@@ -22,8 +22,8 @@
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VMStatus;
-import org.ovirt.engine.core.common.businessentities.VmsComparer;
import org.ovirt.engine.core.common.businessentities.storage_pool;
+import org.ovirt.engine.core.common.businessentities.comperators.VmsComparer;
import org.ovirt.engine.core.common.eventqueue.Event;
import org.ovirt.engine.core.common.eventqueue.EventQueue;
import org.ovirt.engine.core.common.eventqueue.EventResult;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
index 00bb58a..40f6cfa 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVMActionRunner.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.VM;
-import org.ovirt.engine.core.common.businessentities.VmsComparer;
+import org.ovirt.engine.core.common.businessentities.comperators.VmsComparer;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
index c40d41c..a55d0ca 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.businessentities;
+import
org.ovirt.engine.core.common.businessentities.comperators.BusinessEntityGuidComparator;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
index fab167c..852e933 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
@@ -2,6 +2,7 @@
import java.util.Map;
+import
org.ovirt.engine.core.common.businessentities.comperators.BusinessEntityComparator;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
index cffc87e..8ebe4a6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Date;
+import
org.ovirt.engine.core.common.businessentities.comperators.BusinessEntityGuidComparator;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
index cb28ddc..478d739 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
@@ -2,6 +2,7 @@
import java.util.ArrayList;
+import
org.ovirt.engine.core.common.businessentities.comperators.BusinessEntityGuidComparator;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityComparator.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityComparator.java
similarity index 81%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityComparator.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityComparator.java
index 9034fb6..ab67b86 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityComparator.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityComparator.java
@@ -1,8 +1,10 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
import java.io.Serializable;
import java.util.Comparator;
+import org.ovirt.engine.core.common.businessentities.BusinessEntity;
+
/**
* Generic for implementing a business entity comparator based on ID comparison
*/
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityGuidComparator.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityGuidComparator.java
similarity index 70%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityGuidComparator.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityGuidComparator.java
index a8090e1..b70af09 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntityGuidComparator.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/BusinessEntityGuidComparator.java
@@ -1,5 +1,6 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
+import org.ovirt.engine.core.common.businessentities.BusinessEntity;
import org.ovirt.engine.core.compat.Guid;
public class BusinessEntityGuidComparator<T extends BusinessEntity<Guid>>
extends BusinessEntityComparator<T, Guid> {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImagesComparerByName.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/ImagesComparerByName.java
similarity index 77%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImagesComparerByName.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/ImagesComparerByName.java
index 24c8e11..35d0b94 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImagesComparerByName.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/ImagesComparerByName.java
@@ -1,7 +1,9 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
import java.io.Serializable;
+import org.ovirt.engine.core.common.businessentities.DiskImage;
+
public class ImagesComparerByName implements java.util.Comparator<DiskImage>,
Serializable {
private static final long serialVersionUID = -6854346772820338515L;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/InterfaceComparerByMAC.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/InterfaceComparerByMAC.java
similarity index 87%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/InterfaceComparerByMAC.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/InterfaceComparerByMAC.java
index 0414957..f98cb9b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/InterfaceComparerByMAC.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/InterfaceComparerByMAC.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
import java.io.Serializable;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplateComparerByDiskSize.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmTemplateComparerByDiskSize.java
similarity index 78%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplateComparerByDiskSize.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmTemplateComparerByDiskSize.java
index 38fe337..96fff0b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplateComparerByDiskSize.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmTemplateComparerByDiskSize.java
@@ -1,7 +1,9 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
import java.io.Serializable;
+import org.ovirt.engine.core.common.businessentities.VmTemplate;
+
public class VmTemplateComparerByDiskSize implements
java.util.Comparator<VmTemplate>, Serializable {
private static final long serialVersionUID = -1620249078971769528L;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmsComparer.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparer.java
similarity index 76%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmsComparer.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparer.java
index 7ca03ff..96684d7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmsComparer.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparer.java
@@ -1,7 +1,9 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
import java.io.Serializable;
+import org.ovirt.engine.core.common.businessentities.VM;
+
public class VmsComparer implements java.util.Comparator<VM>, Serializable {
private static final long serialVersionUID = 2773040834879205191L;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmsComparerByDiskSize.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparerByDiskSize.java
similarity index 78%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmsComparerByDiskSize.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparerByDiskSize.java
index e2b0f07..46b14c0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmsComparerByDiskSize.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/comperators/VmsComparerByDiskSize.java
@@ -1,7 +1,9 @@
-package org.ovirt.engine.core.common.businessentities;
+package org.ovirt.engine.core.common.businessentities.comperators;
import java.io.Serializable;
+import org.ovirt.engine.core.common.businessentities.VM;
+
public class VmsComparerByDiskSize implements java.util.Comparator<VM>,
Serializable {
private static final long serialVersionUID = -3546735706731409532L;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java
index 7631fa1..502d855 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkStatistics.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.common.businessentities.network;
-import
org.ovirt.engine.core.common.businessentities.BusinessEntityGuidComparator;
+import
org.ovirt.engine.core.common.businessentities.comperators.BusinessEntityGuidComparator;
import org.ovirt.engine.core.compat.NGuid;
/**
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoDbFacadeImpl.java
index 872d079..a5f1999 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoDbFacadeImpl.java
@@ -4,7 +4,7 @@
import java.sql.SQLException;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.InterfaceComparerByMAC;
+import
org.ovirt.engine.core.common.businessentities.comperators.InterfaceComparerByMAC;
import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.compat.Guid;
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 ae829de..20b432e 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
@@ -123,8 +123,8 @@
<include name="common/businessentities/VmOsType.java" />
<include name="common/businessentities/OsType.java" />
<include name="common/businessentities/VmPoolType.java" />
- <include name="common/businessentities/VmsComparer.java" />
- <include
name="common/businessentities/VmsComparerByDiskSize.java" />
+ <include
name="common/businessentities/comperators/VmsComparer.java" />
+ <include
name="common/businessentities/comperators/VmsComparerByDiskSize.java" />
<include name="common/businessentities/VmStatic.java" />
<include name="common/businessentities/VmStatistics.java" />
<include name="common/businessentities/VMStatus.java" />
@@ -152,8 +152,8 @@
<include name="common/businessentities/FileRepoMetaData.java" />
<include name="common/businessentities/RepoFileMetaData.java" />
<include name="common/businessentities/ImageFileType.java" />
- <include
name="common/businessentities/BusinessEntityGuidComparator.java" />
- <include
name="common/businessentities/BusinessEntityComparator.java" />
+ <include
name="common/businessentities/comperators/BusinessEntityGuidComparator.java" />
+ <include
name="common/businessentities/comperators/BusinessEntityComparator.java" />
<include name="common/businessentities/Identifiable.java" />
<include
name="common/businessentities/VmGuestAgentInterface.java" />
<include name="common/job/*.java" />
--
To view, visit http://gerrit.ovirt.org/14192
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70f2432df8338c736d9ab0e6c97e38acf3ddf92f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
