http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java b/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java index ac16cc9..fbed8bf 100644 --- a/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java +++ b/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java @@ -20,10 +20,13 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.SSHKeyPairVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={SSHKeyPairDao.class}) public class SSHKeyPairDaoImpl extends GenericDaoBase<SSHKeyPairVO, Long> implements SSHKeyPairDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/dao/UserAccountDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/dao/UserAccountDaoImpl.java b/server/src/com/cloud/user/dao/UserAccountDaoImpl.java index 663e58f..9edfe4a 100644 --- a/server/src/com/cloud/user/dao/UserAccountDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserAccountDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.user.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.UserAccount; import com.cloud.user.UserAccountVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={UserAccountDao.class}) public class UserAccountDaoImpl extends GenericDaoBase<UserAccountVO, Long> implements UserAccountDao { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/dao/UserDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/dao/UserDaoImpl.java b/server/src/com/cloud/user/dao/UserDaoImpl.java index fefbb8a..2f318a3 100644 --- a/server/src/com/cloud/user/dao/UserDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.UserVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={UserDao.class}) public class UserDaoImpl extends GenericDaoBase<UserVO, Long> implements UserDao { protected SearchBuilder<UserVO> UsernamePasswordSearch; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java b/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java index fd7795a..913ec07 100644 --- a/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java @@ -26,6 +26,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.user.UserStatisticsVO; import com.cloud.utils.DateUtil; @@ -34,6 +35,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UserStatisticsDao.class}) public class UserStatisticsDaoImpl extends GenericDaoBase<UserStatisticsVO, Long> implements UserStatisticsDao { private static final Logger s_logger = Logger.getLogger(UserStatisticsDaoImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java b/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java index 7275142..c4dfe66 100644 --- a/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java @@ -18,9 +18,12 @@ package com.cloud.user.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.UserStatsLogVO; import com.cloud.utils.db.GenericDaoBase; +@Component @Local(value={UserStatsLogDao.class}) public class UserStatsLogDaoImpl extends GenericDaoBase<UserStatsLogVO, Long> implements UserStatsLogDao { public UserStatsLogDaoImpl(){ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/uuididentity/IdentityServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java index 6ec3f25..9eef34e 100644 --- a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java +++ b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java @@ -21,12 +21,15 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.api.IdentityMapper; import com.cloud.api.IdentityService; import com.cloud.utils.component.Inject; import com.cloud.utils.component.Manager; import com.cloud.uuididentity.dao.IdentityDao; +@Component @Local(value = { IdentityService.class }) public class IdentityServiceImpl implements Manager, IdentityService { private String _name; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java index ce0ca13..f35b57c 100644 --- a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java +++ b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java @@ -26,6 +26,7 @@ import java.util.UUID; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.IdentityMapper; import com.cloud.exception.InvalidParameterValueException; @@ -35,6 +36,7 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={IdentityDao.class}) public class IdentityDaoImpl extends GenericDaoBase<IdentityVO, Long> implements IdentityDao { private static final Logger s_logger = Logger.getLogger(IdentityDaoImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java index dc51eab..20deaf1 100644 --- a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java @@ -22,9 +22,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.cluster.ClusterManagerListener; import com.cloud.cluster.ManagementServerHostVO; +@Component @Local(value=VirtualMachineManager.class) public class ClusteredVirtualMachineManagerImpl extends VirtualMachineManagerImpl implements ClusterManagerListener { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/ItWorkDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/ItWorkDaoImpl.java b/server/src/com/cloud/vm/ItWorkDaoImpl.java index 6f63eb3..3a849f8 100644 --- a/server/src/com/cloud/vm/ItWorkDaoImpl.java +++ b/server/src/com/cloud/vm/ItWorkDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -28,6 +30,7 @@ import com.cloud.utils.time.InaccurateClock; import com.cloud.vm.ItWorkVO.Step; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value=ItWorkDao.class) public class ItWorkDaoImpl extends GenericDaoBase<ItWorkVO, String> implements ItWorkDao { protected final SearchBuilder<ItWorkVO> AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index dbcbeb8..ccbcf82 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -33,6 +33,7 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.ControlledEntity.ACLType; import com.cloud.agent.AgentManager; @@ -234,6 +235,7 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = { UserVmManager.class, UserVmService.class }) public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager { private static final Logger s_logger = Logger.getLogger(UserVmManagerImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 9230f4a..ac423ee 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -37,6 +37,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager.OnError; @@ -160,6 +161,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = VirtualMachineManager.class) public class VirtualMachineManagerImpl implements VirtualMachineManager, Listener { private static final Logger s_logger = Logger.getLogger(VirtualMachineManagerImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java index e0d113d..988b68f 100644 --- a/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java +++ b/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java @@ -26,6 +26,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.info.ConsoleProxyLoadInfo; import com.cloud.utils.Pair; @@ -38,6 +39,7 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value={ConsoleProxyDao.class}) public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> implements ConsoleProxyDao { private static final Logger s_logger = Logger.getLogger(ConsoleProxyDaoImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index 175d3f2..d63c5b4 100755 --- a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.host.HostVO; import com.cloud.host.dao.HostDaoImpl; import com.cloud.network.Network; @@ -43,6 +45,7 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value = { DomainRouterDao.class }) public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> implements DomainRouterDao { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java b/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java index ff31c0a..0ce127e 100644 --- a/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java +++ b/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.InstanceGroupVO; +@Component @Local (value={InstanceGroupDao.class}) public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long> implements InstanceGroupDao{ private SearchBuilder<InstanceGroupVO> AccountIdNameSearch; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java b/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java index 4c7448b..a33cc84 100644 --- a/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java +++ b/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.InstanceGroupVMMapVO; +@Component @Local(value={InstanceGroupVMMapDao.class}) public class InstanceGroupVMMapDaoImpl extends GenericDaoBase<InstanceGroupVMMapVO, Long> implements InstanceGroupVMMapDao{ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/NicDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/NicDaoImpl.java b/server/src/com/cloud/vm/dao/NicDaoImpl.java index 3cd7fa6..e09b0ab 100644 --- a/server/src/com/cloud/vm/dao/NicDaoImpl.java +++ b/server/src/com/cloud/vm/dao/NicDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; @@ -31,6 +33,7 @@ import com.cloud.vm.Nic.State; import com.cloud.vm.NicVO; import com.cloud.vm.VirtualMachine; +@Component @Local(value=NicDao.class) public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao { private final SearchBuilder<NicVO> AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java index 573f27d..dedf077 100644 --- a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java +++ b/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java @@ -20,7 +20,9 @@ package com.cloud.vm.dao; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; +@Component @Local(value = { UserVmDao.class }) public class RandomlyIncreasingVMInstanceDaoImpl extends UserVmDaoImpl { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java index 3577027..6847566 100644 --- a/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.utils.db.Attribute; import com.cloud.utils.db.GenericDaoBase; @@ -36,6 +37,7 @@ import com.cloud.vm.SecondaryStorageVm; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value={SecondaryStorageVmDao.class}) public class SecondaryStorageVmDaoImpl extends GenericDaoBase<SecondaryStorageVmVO, Long> implements SecondaryStorageVmDao { private static final Logger s_logger = Logger.getLogger(SecondaryStorageVmDaoImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/UserVmDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java index db1d877..ebe67be 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -29,6 +29,7 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.configuration.Resource; import com.cloud.server.ResourceTag.TaggedResourceType; @@ -52,6 +53,7 @@ import com.cloud.vm.dao.UserVmData.NicData; import com.cloud.vm.dao.UserVmData.SecurityGroupData; +@Component @Local(value={UserVmDao.class}) public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements UserVmDao { public static final Logger s_logger = Logger.getLogger(UserVmDaoImpl.class); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/UserVmDetailsDao.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmDetailsDao.java b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java index bdccec9..87fb9b6 100644 --- a/server/src/com/cloud/vm/dao/UserVmDetailsDao.java +++ b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java @@ -18,9 +18,12 @@ package com.cloud.vm.dao; import java.util.Map; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDao; import com.cloud.vm.UserVmDetailVO; +@Component public interface UserVmDetailsDao extends GenericDao<UserVmDetailVO, Long> { Map<String, String> findDetails(long vmId); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index b74741b..93c481e 100644 --- a/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -22,12 +22,15 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.vm.UserVmDetailVO; +@Component @Local(value=UserVmDetailsDao.class) public class UserVmDetailsDaoImpl extends GenericDaoBase<UserVmDetailVO, Long> implements UserVmDetailsDao { protected final SearchBuilder<UserVmDetailVO> VmSearch; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java index 571b5d1..c1b6335 100644 --- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java +++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java @@ -27,10 +27,13 @@ import java.util.List; import java.util.Map; import javax.ejb.Local; +import javax.inject.Inject; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDaoImpl; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.tags.dao.ResourceTagsDaoImpl; @@ -56,6 +59,7 @@ import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.Type; +@Component @Local(value = { VMInstanceDao.class }) public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implements VMInstanceDao { @@ -80,9 +84,13 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem protected SearchBuilder<VMInstanceVO> NetworkTypeSearch; protected GenericSearchBuilder<VMInstanceVO, String> DistinctHostNameSearch; +/* ResourceTagsDaoImpl _tagsDao = ComponentLocator.inject(ResourceTagsDaoImpl.class); NicDao _nicDao = ComponentLocator.inject(NicDaoImpl.class); - +*/ + @Inject ResourceTagsDaoImpl _tagsDao; + @Inject NicDao _nicDao; + protected final Attribute _updateTimeAttr; private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART1 = @@ -98,7 +106,10 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem " AND host.pod_id = ? AND host.cluster_id = ? AND host.type = 'Routing' " + " GROUP BY host.id ORDER BY 2 ASC "; +/* protected final HostDaoImpl _hostDao = ComponentLocator.inject(HostDaoImpl.class); + */ + @Inject protected HostDao _hostDao; protected VMInstanceDaoImpl() {
