Updated Branches: refs/heads/javelin 7b11b71d8 -> e5bf16b00
Fixing error with merge Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e5bf16b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e5bf16b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e5bf16b0 Branch: refs/heads/javelin Commit: e5bf16b00f275eecff128e0193922cc00ad3b06e Parents: 7b11b71 Author: Prachi Damle <[email protected]> Authored: Tue Jan 22 16:43:54 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Tue Jan 22 16:44:28 2013 -0800 ---------------------------------------------------------------------- .../cloud/entity/api/db/dao/VMEntityDaoImpl.java | 3 ++- .../platform/orchestration/CloudOrchestrator.java | 3 ++- .../storage/image/db/ImageDataDaoImpl.java | 13 +++++++------ server/src/com/cloud/host/dao/HostDaoImpl.java | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5bf16b0/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java index bdc0e91..7d80e8a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java @@ -31,8 +31,9 @@ import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.network.NetworkVO; + import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.utils.Pair; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5bf16b0/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java index 2a7e2f8..ea9a30b 100755 --- a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java @@ -41,8 +41,9 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.NetworkVO; + import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkVO; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DiskOfferingVO; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5bf16b0/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java index 082a078..849f197 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java @@ -75,18 +75,18 @@ import com.cloud.utils.exception.CloudRuntimeException; public class ImageDataDaoImpl extends GenericDaoBase<ImageDataVO, Long> implements ImageDataDao { private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class); - + @Inject VMTemplateZoneDao _templateZoneDao = null; - + @Inject VMTemplateDetailsDao _templateDetailsDao = null; - + @Inject ConfigurationDao _configDao = null; - + @Inject HostDao _hostDao = null; - + @Inject DomainDao _domainDao = null; - + @Inject DataCenterDao _dcDao = null; private final String SELECT_TEMPLATE_HOST_REF = "SELECT t.id, h.data_center_id, t.unique_name, t.name, t.public, t.featured, t.type, t.hvm, t.bits, t.url, t.format, t.created, t.account_id, " + "t.checksum, t.display_text, t.enable_password, t.guest_os_id, t.bootable, t.prepopulate, t.cross_zones, t.hypervisor_type FROM vm_template t"; @@ -112,6 +112,7 @@ public class ImageDataDaoImpl extends GenericDaoBase<ImageDataVO, Long> implemen private GenericSearchBuilder<ImageDataVO, Long> CountTemplatesByAccount; //ResourceTagsDaoImpl _tagsDao = ComponentInject.inject(ResourceTagsDaoImpl.class); + @Inject ResourceTagsDaoImpl _tagsDao = null; private String routerTmpltName; private String consoleProxyTmpltName; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5bf16b0/server/src/com/cloud/host/dao/HostDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java index 50de8e6..5d56485 100755 --- a/server/src/com/cloud/host/dao/HostDaoImpl.java +++ b/server/src/com/cloud/host/dao/HostDaoImpl.java @@ -64,7 +64,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; - +@Component @Local(value = { HostDao.class }) @DB(txn = false) @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
