You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/11/02 02:08:44 UTC
[7/11] Add Spring annotation to major components
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
index e3dde51..dcd1238 100644
--- a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.ha.HaWorkVO;
import com.cloud.network.security.SecurityGroupWork;
@@ -36,6 +37,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value={SecurityGroupWorkDao.class})
public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO, Long> implements SecurityGroupWorkDao {
private static final Logger s_logger = Logger.getLogger(SecurityGroupWorkDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
index 795dd0e..746b66f 100644
--- a/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
@@ -28,6 +28,7 @@ import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.network.security.VmRulesetLogVO;
import com.cloud.utils.db.GenericDaoBase;
@@ -35,6 +36,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={VmRulesetLogDao.class})
public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> implements VmRulesetLogDao {
protected static Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index 3375714..5b64da0 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -24,6 +24,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.api.commands.ListNetworkACLsCmd;
@@ -65,6 +66,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
+@Component
@Local(value = { NetworkACLService.class, NetworkACLManager.class})
public class NetworkACLManagerImpl implements Manager,NetworkACLManager{
String _name;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 675ae59..a81e981 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -31,6 +31,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.acl.ControlledEntity.ACLType;
import com.cloud.api.commands.ListPrivateGatewaysCmd;
@@ -116,6 +117,7 @@ import com.cloud.vm.ReservationContextImpl;
import com.cloud.vm.dao.DomainRouterDao;
+@Component
@Local(value = { VpcManager.class, VpcService.class })
public class VpcManagerImpl implements VpcManager, Manager{
private static final Logger s_logger = Logger.getLogger(VpcManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java b/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
index 35b81a8..ecab3bb 100644
--- a/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.network.vpc.PrivateIpVO;
import com.cloud.utils.db.DB;
@@ -33,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
-
+@Component
@Local(value = PrivateIpDao.class)
@DB(txn = false)
public class PrivateIpDaoImpl extends GenericDaoBase<PrivateIpVO, Long> implements PrivateIpDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java b/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
index b3077e7..42f0fc4 100644
--- a/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.vpc.StaticRoute;
import com.cloud.network.vpc.StaticRouteVO;
import com.cloud.server.ResourceTag.TaggedResourceType;
@@ -34,7 +36,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
-
+@Component
@Local(value = StaticRouteDao.class)
@DB(txn = false)
public class StaticRouteDaoImpl extends GenericDaoBase<StaticRouteVO, Long> implements StaticRouteDao{
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
index ffc3542..a3bb7d5 100644
--- a/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.vpc.Vpc;
import com.cloud.network.vpc.VpcVO;
import com.cloud.server.ResourceTag.TaggedResourceType;
@@ -34,7 +36,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
-
+@Component
@Local(value = VpcDao.class)
@DB(txn = false)
public class VpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements VpcDao{
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
index 73649d6..a1cd934 100644
--- a/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -18,6 +18,8 @@ package com.cloud.network.vpc.dao;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.vpc.VpcGateway;
import com.cloud.network.vpc.VpcGatewayVO;
import com.cloud.utils.db.DB;
@@ -25,7 +27,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-
+@Component
@Local(value = VpcGatewayDao.class)
@DB(txn = false)
public class VpcGatewayDaoImpl extends GenericDaoBase<VpcGatewayVO, Long> implements VpcGatewayDao{
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
index 55cfd95..2cda547 100644
--- a/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java
@@ -18,6 +18,8 @@ package com.cloud.network.vpc.dao;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.vpc.VpcOfferingVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@@ -26,7 +28,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
-
+@Component
@Local(value = VpcOfferingDao.class)
@DB(txn = false)
public class VpcOfferingDaoImpl extends GenericDaoBase<VpcOfferingVO, Long> implements VpcOfferingDao{
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
index 056df74..4b5f1b9 100644
--- a/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
+++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.Network.Service;
import com.cloud.network.vpc.VpcOfferingServiceMapVO;
import com.cloud.utils.db.DB;
@@ -29,7 +31,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
-
+@Component
@Local(value = VpcOfferingServiceMapDao.class)
@DB(txn = false)
public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase<VpcOfferingServiceMapVO, Long> implements VpcOfferingServiceMapDao{
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index c01dc6e..73570aa 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -24,6 +24,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.commands.ListRemoteAccessVpnsCmd;
import com.cloud.api.commands.ListVpnUsersCmd;
@@ -80,6 +81,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.net.NetUtils;
+@Component
@Local(value = RemoteAccessVpnService.class)
public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manager {
private final static Logger s_logger = Logger.getLogger(RemoteAccessVpnManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index ae0f4ec..f26ef7f 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -24,6 +24,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.commands.CreateVpnConnectionCmd;
import com.cloud.api.commands.CreateVpnCustomerGatewayCmd;
@@ -80,6 +81,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
import com.cloud.vm.DomainRouterVO;
+@Component
@Local(value = { Site2SiteVpnManager.class, Site2SiteVpnService.class } )
public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
private static final Logger s_logger = Logger.getLogger(Site2SiteVpnManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java b/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
index 4d5f1fb..d1e4424 100644
--- a/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
+++ b/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.ejb.Local;
import javax.persistence.EntityExistsException;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.Network;
import com.cloud.network.Networks.TrafficType;
import com.cloud.offering.NetworkOffering;
@@ -34,6 +36,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value = NetworkOfferingDao.class)
@DB(txn = false)
public class NetworkOfferingDaoImpl extends GenericDaoBase<NetworkOfferingVO, Long> implements NetworkOfferingDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
index b3144c6..7282443 100644
--- a/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
+++ b/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.offerings.NetworkOfferingServiceMapVO;
@@ -31,6 +33,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
+@Component
@Local(value=NetworkOfferingServiceMapDao.class) @DB(txn=false)
public class NetworkOfferingServiceMapDaoImpl extends GenericDaoBase<NetworkOfferingServiceMapVO, Long> implements NetworkOfferingServiceMapDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/projects/ProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java
index 77b778e..d9e59d6 100755
--- a/server/src/com/cloud/projects/ProjectManagerImpl.java
+++ b/server/src/com/cloud/projects/ProjectManagerImpl.java
@@ -39,6 +39,7 @@ import javax.mail.internet.InternetAddress;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.configuration.Config;
@@ -88,6 +89,7 @@ import com.sun.mail.smtp.SMTPMessage;
import com.sun.mail.smtp.SMTPSSLTransport;
import com.sun.mail.smtp.SMTPTransport;
+@Component
@Local(value = { ProjectService.class, ProjectManager.class })
public class ProjectManagerImpl implements ProjectManager, Manager{
public static final Logger s_logger = Logger.getLogger(ProjectManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java
index d18f692..b089e58 100644
--- a/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java
+++ b/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.projects.ProjectAccount;
import com.cloud.projects.ProjectAccountVO;
@@ -31,6 +32,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value = { ProjectAccountDao.class })
public class ProjectAccountDaoImpl extends GenericDaoBase<ProjectAccountVO, Long> implements ProjectAccountDao {
protected final SearchBuilder<ProjectAccountVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/projects/dao/ProjectDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/dao/ProjectDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectDaoImpl.java
index 81e170a..9a4c4f1 100644
--- a/server/src/com/cloud/projects/dao/ProjectDaoImpl.java
+++ b/server/src/com/cloud/projects/dao/ProjectDaoImpl.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectVO;
@@ -35,6 +36,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value = { ProjectDao.class })
public class ProjectDaoImpl extends GenericDaoBase<ProjectVO, Long> implements ProjectDao {
private static final Logger s_logger = Logger.getLogger(ProjectDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java
index d33e21a..4491512 100644
--- a/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java
+++ b/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.projects.ProjectInvitation.State;
import com.cloud.projects.ProjectInvitationVO;
@@ -30,6 +31,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value = { ProjectInvitationDao.class })
public class ProjectInvitationDaoImpl extends GenericDaoBase<ProjectInvitationVO, Long> implements ProjectInvitationDao {
private static final Logger s_logger = Logger.getLogger(ProjectInvitationDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/resource/DummyHostDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/com/cloud/resource/DummyHostDiscoverer.java
index 87a0ac0..905fccf 100755
--- a/server/src/com/cloud/resource/DummyHostDiscoverer.java
+++ b/server/src/com/cloud/resource/DummyHostDiscoverer.java
@@ -26,10 +26,12 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.host.HostVO;
import com.cloud.hypervisor.Hypervisor;
+@Component
@Local(value=Discoverer.class)
public class DummyHostDiscoverer implements Discoverer {
private static final Logger s_logger = Logger.getLogger(DummyHostDiscoverer.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index ced601b..6961768 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -31,6 +31,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.TapAgentsAction;
@@ -151,6 +152,7 @@ import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.VMInstanceDao;
+@Component
@Local({ ResourceManager.class, ResourceService.class })
public class ResourceManagerImpl implements ResourceManager, ResourceService, Manager {
private static final Logger s_logger = Logger.getLogger(ResourceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 7f446d7..486711a 100755
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -29,6 +29,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.acl.SecurityChecker.AccessType;
import com.cloud.alert.AlertManager;
@@ -81,6 +82,7 @@ import com.cloud.vm.dao.VMInstanceDao;
import edu.emory.mathcs.backport.java.util.Arrays;
+@Component
@Local(value = { ResourceLimitService.class })
public class ResourceLimitManagerImpl implements ResourceLimitService, Manager {
public static final Logger s_logger = Logger.getLogger(ResourceLimitManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java b/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java
index 69d8774..8fa9e41 100644
--- a/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java
+++ b/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java
@@ -20,11 +20,14 @@ import java.util.Date;
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.SearchCriteria.Op;
+@Component
@Local(value={CommandExecLogDao.class})
public class CommandExecLogDaoImpl extends GenericDaoBase<CommandExecLogVO, Long> implements CommandExecLogDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java
index 8fd21fd..d06b22d 100755
--- a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java
@@ -24,6 +24,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.api.Command;
import com.cloud.configuration.Config;
@@ -47,6 +48,7 @@ import com.cloud.vm.SystemVmLoadScanner.AfterScanAction;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.SecondaryStorageVmDao;
+@Component
@Local(value = { SecondaryStorageVmManager.class })
public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerImpl {
private static final Logger s_logger = Logger.getLogger(PremiumSecondaryStorageManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
index ce7cdab..25fa802 100644
--- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
+++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java
@@ -21,10 +21,13 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.springframework.stereotype.Component;
+
/**
* Use this UserAuthenticator if users are already authenticated outside
*
*/
+@Component
@Local(value={UserAuthenticator.class})
public abstract class DefaultUserAuthenticator implements UserAuthenticator {
private String _name = null;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 71ad51f..a43c2b3 100644
--- a/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ b/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -23,6 +23,7 @@ import javax.ejb.Local;
import javax.persistence.EntityExistsException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.DiskOfferingVO;
@@ -31,6 +32,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={ServiceOfferingDao.class}) @DB(txn=false)
public class ServiceOfferingDaoImpl extends GenericDaoBase<ServiceOfferingVO, Long> implements ServiceOfferingDao {
protected static final Logger s_logger = Logger.getLogger(ServiceOfferingDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/OCFS2ManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java
index a399b03..b578169 100755
--- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java
+++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java
@@ -25,6 +25,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.api.Answer;
@@ -49,6 +50,7 @@ import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.db.SearchCriteriaService;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value ={OCFS2Manager.class})
public class OCFS2ManagerImpl implements OCFS2Manager, ResourceListener {
String _name;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index fc6fb5b..2d96df7 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -45,6 +45,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.api.Answer;
@@ -212,6 +213,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
+@Component
@Local(value = { StorageManager.class, StorageService.class })
public class StorageManagerImpl implements StorageManager, Manager, ClusterManagerListener {
private static final Logger s_logger = Logger.getLogger(StorageManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
index 7d33c15..6b1a957 100644
--- a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
+++ b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
@@ -27,6 +27,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.deploy.DeploymentPlan;
import com.cloud.deploy.DeploymentPlanner.ExcludeList;
@@ -44,6 +45,7 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.utils.component.Inject;
+@Component
@Local(value=StoragePoolAllocator.class)
public class FirstFitStoragePoolAllocator extends AbstractStoragePoolAllocator {
private static final Logger s_logger = Logger.getLogger(FirstFitStoragePoolAllocator.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java
index 2418583..a6d227b 100644
--- a/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java
+++ b/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java
@@ -23,6 +23,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.deploy.DeploymentPlan;
@@ -34,6 +35,7 @@ import com.cloud.vm.DiskProfile;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value=StoragePoolAllocator.class)
public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAllocator {
private static final Logger s_logger = Logger.getLogger(GarbageCollectingStoragePoolAllocator.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
index 445f278..41952c2 100644
--- a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
+++ b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
@@ -25,6 +25,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.capacity.CapacityVO;
import com.cloud.capacity.dao.CapacityDao;
@@ -61,6 +62,7 @@ import com.cloud.vm.dao.VMInstanceDao;
// Rush to make LocalStoragePoolAllocator use static allocation status, we should revisit the overall
// allocation process to make it more reliable in next release. The code put in here is pretty ugly
//
+@Component
@Local(value = StoragePoolAllocator.class)
public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator {
private static final Logger s_logger = Logger.getLogger(LocalStoragePoolAllocator.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java b/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java
index f1da114..711d40f 100644
--- a/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java
+++ b/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java
@@ -22,6 +22,8 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.springframework.stereotype.Component;
+
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.DataCenterVO;
@@ -37,6 +39,7 @@ import com.cloud.vm.DiskProfile;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value=StoragePoolAllocator.class)
public class UseLocalForRootAllocator extends LocalStoragePoolAllocator implements StoragePoolAllocator {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
index cd2980e..1f68c50 100644
--- a/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
@@ -23,6 +23,7 @@ import javax.ejb.Local;
import javax.persistence.EntityExistsException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.DiskOfferingVO.Type;
@@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value={DiskOfferingDao.class})
public class DiskOfferingDaoImpl extends GenericDaoBase<DiskOfferingVO, Long> implements DiskOfferingDao {
private static final Logger s_logger = Logger.getLogger(DiskOfferingDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java b/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java
index 611694c..d017b99 100644
--- a/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java
@@ -18,9 +18,12 @@ package com.cloud.storage.dao;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.utils.db.GenericDaoBase;
+@Component
@Local (value={GuestOSCategoryDao.class})
public class GuestOSCategoryDaoImpl extends GenericDaoBase<GuestOSCategoryVO, Long> implements GuestOSCategoryDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java b/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java
index 251deb5..c39fae8 100755
--- a/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java
@@ -20,12 +20,15 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local (value={GuestOSDao.class})
public class GuestOSDaoImpl extends GenericDaoBase<GuestOSVO, Long> implements GuestOSDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java
index 2ae394e..286b1d9 100644
--- a/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.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.storage.LaunchPermissionVO;
import com.cloud.storage.VMTemplateVO;
@@ -37,6 +38,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value={LaunchPermissionDao.class})
public class LaunchPermissionDaoImpl extends GenericDaoBase<LaunchPermissionVO, Long> implements LaunchPermissionDao {
private static final Logger s_logger = Logger.getLogger(LaunchPermissionDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
index 65e2f5f..30569a0 100644
--- a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.storage.Snapshot;
@@ -44,6 +45,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.VMInstanceDaoImpl;
+@Component
@Local (value={SnapshotDao.class})
public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements SnapshotDao {
public static final Logger s_logger = Logger.getLogger(SnapshotDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
index 10eaaea..9beed67 100644
--- a/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.SnapshotPolicyVO;
import com.cloud.utils.DateUtil.IntervalType;
import com.cloud.utils.db.Filter;
@@ -28,6 +30,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local (value={SnapshotPolicyDao.class})
public class SnapshotPolicyDaoImpl extends GenericDaoBase<SnapshotPolicyVO, Long> implements SnapshotPolicyDao {
private final SearchBuilder<SnapshotPolicyVO> VolumeIdSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java
index c4e6a5a..c01644e 100644
--- a/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java
@@ -21,13 +21,15 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.Snapshot;
import com.cloud.storage.SnapshotScheduleVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-
+@Component
@Local (value={SnapshotScheduleDao.class})
public class SnapshotScheduleDaoImpl extends GenericDaoBase<SnapshotScheduleVO, Long> implements SnapshotScheduleDao {
protected final SearchBuilder<SnapshotScheduleVO> executableSchedulesSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
index 730610b..3573649 100644
--- a/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
@@ -27,6 +27,8 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.springframework.stereotype.Component;
+
import com.cloud.host.Status;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePoolDetailVO;
@@ -43,6 +45,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value={StoragePoolDao.class}) @DB(txn=false)
public class StoragePoolDaoImpl extends GenericDaoBase<StoragePoolVO, Long> implements StoragePoolDao {
protected final SearchBuilder<StoragePoolVO> AllFieldSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
index ff74b4d..8cc5d7b 100644
--- a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
@@ -22,12 +22,15 @@ import java.util.Map;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.StoragePoolDetailVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value=StoragePoolDetailsDao.class)
public class StoragePoolDetailsDaoImpl extends GenericDaoBase<StoragePoolDetailVO, Long> implements StoragePoolDetailsDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java
index b44f8a6..4f509d1 100644
--- a/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.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.host.Status;
import com.cloud.storage.StoragePoolHostVO;
@@ -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 = { StoragePoolHostDao.class })
public class StoragePoolHostDaoImpl extends GenericDaoBase<StoragePoolHostVO, Long> implements StoragePoolHostDao {
public static final Logger s_logger = Logger.getLogger(StoragePoolHostDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
index 47a2145..360a814 100644
--- a/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java
@@ -24,6 +24,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.StoragePoolWorkVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@@ -32,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value={StoragePoolWorkDao.class}) @DB(txn=false)
public class StoragePoolWorkDaoImpl extends GenericDaoBase<StoragePoolWorkVO, Long> implements StoragePoolWorkDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/SwiftDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/SwiftDaoImpl.java b/server/src/com/cloud/storage/dao/SwiftDaoImpl.java
index 2758170..19e5a85 100644
--- a/server/src/com/cloud/storage/dao/SwiftDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/SwiftDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.api.to.SwiftTO;
import com.cloud.storage.SwiftVO;
@@ -31,7 +32,7 @@ import com.cloud.utils.db.GenericDaoBase;
*
*
*/
-
+@Component
@Local (value={SwiftDao.class})
public class SwiftDaoImpl extends GenericDaoBase<SwiftVO, Long> implements SwiftDao {
public static final Logger s_logger = Logger.getLogger(SwiftDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/UploadDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/UploadDaoImpl.java b/server/src/com/cloud/storage/dao/UploadDaoImpl.java
index 53ff3ae..31fad43 100755
--- a/server/src/com/cloud/storage/dao/UploadDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/UploadDaoImpl.java
@@ -19,6 +19,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.storage.UploadVO;
import com.cloud.storage.Upload.Status;
@@ -27,6 +28,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={UploadDao.class})
public class UploadDaoImpl extends GenericDaoBase<UploadVO, Long> implements UploadDao {
public static final Logger s_logger = Logger.getLogger(UploadDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
index 2a0dfc8..80f2ca4 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -31,6 +31,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.BaseCmd;
import com.cloud.configuration.dao.ConfigurationDao;
@@ -67,6 +68,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value={VMTemplateDao.class})
public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implements VMTemplateDao {
private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
index 885fe37..e066dff 100644
--- a/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java
@@ -22,12 +22,15 @@ import java.util.Map;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.storage.VMTemplateDetailVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value=VMTemplateDetailsDao.class)
public class VMTemplateDetailsDaoImpl extends GenericDaoBase<VMTemplateDetailVO, Long> implements VMTemplateDetailsDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
index 943aa66..8f9a449 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
@@ -29,6 +29,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
@@ -43,6 +44,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={VMTemplateHostDao.class})
public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long> implements VMTemplateHostDao {
public static final Logger s_logger = Logger.getLogger(VMTemplateHostDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
index 4138ca1..292bd5b 100644
--- a/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.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.storage.VMTemplateStoragePoolVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
@@ -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={VMTemplatePoolDao.class})
public class VMTemplatePoolDaoImpl extends GenericDaoBase<VMTemplateStoragePoolVO, Long> implements VMTemplatePoolDao {
public static final Logger s_logger = Logger.getLogger(VMTemplatePoolDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java
index 14da824..c65527a 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.storage.VMTemplateSwiftVO;
import com.cloud.utils.db.GenericDaoBase;
@@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
*
*/
+@Component
@Local(value = { VMTemplateSwiftDao.class })
public class VMTemplateSwiftDaoImpl extends GenericDaoBase<VMTemplateSwiftVO, Long> implements VMTemplateSwiftDao {
public static final Logger s_logger = Logger.getLogger(VMTemplateSwiftDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
index 38c04d5..916e0ac 100644
--- a/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
@@ -21,12 +21,14 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={VMTemplateZoneDao.class})
public class VMTemplateZoneDaoImpl extends GenericDaoBase<VMTemplateZoneVO, Long> implements VMTemplateZoneDao {
public static final Logger s_logger = Logger.getLogger(VMTemplateZoneDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 638d209..37f8fcf 100755
--- a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeDaoImpl.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.hypervisor.Hypervisor.HypervisorType;
import com.cloud.server.ResourceTag.TaggedResourceType;
@@ -49,6 +50,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.UpdateBuilder;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value=VolumeDao.class)
public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements VolumeDao {
private static final Logger s_logger = Logger.getLogger(VolumeDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
index 389f8c0..66e1a71 100755
--- a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
@@ -16,17 +16,20 @@
// under the License.
package com.cloud.storage.dao;
-
import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.host.HostVO;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VolumeHostVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+
+@Component
@Local(value={VolumeHostDao.class})
public class VolumeHostDaoImpl extends GenericDaoBase<VolumeHostVO, Long> implements VolumeHostDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 2736777..d888859 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -107,6 +108,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao;
import edu.emory.mathcs.backport.java.util.Collections;
+@Component
@Local(value={DownloadMonitor.class})
public class DownloadMonitorImpl implements DownloadMonitor {
static final Logger s_logger = Logger.getLogger(DownloadMonitorImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
index 65213fb..92edb4d 100755
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
@@ -30,6 +30,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.configuration.dao.ConfigurationDao;
@@ -57,6 +58,7 @@ import com.cloud.utils.script.Script;
* storage servers and make sure everything it can do is
* correct.
*/
+@Component
@Local(value=Discoverer.class)
public class SecondaryStorageDiscoverer extends DiscovererBase implements Discoverer {
private static final Logger s_logger = Logger.getLogger(SecondaryStorageDiscoverer.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index 7a94001..4b98915 100755
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -30,6 +30,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.api.Answer;
@@ -156,6 +157,7 @@ import com.cloud.vm.dao.VMInstanceDao;
// Starting, HA, Migrating, Creating and Running state are all counted as "Open" for available capacity calculation
// because sooner or later, it will be driven into Running state
//
+@Component
@Local(value = { SecondaryStorageVmManager.class })
public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, VirtualMachineGuru<SecondaryStorageVmVO>, SystemVmLoadScanHandler<Long>, ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(SecondaryStorageManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
index 707bc41..635f664 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java
@@ -23,8 +23,11 @@ import java.util.Random;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.springframework.stereotype.Component;
+
import com.cloud.vm.SecondaryStorageVmVO;
+@Component
@Local(value={SecondaryStorageVmAllocator.class})
public class SecondaryStorageVmDefaultAllocator implements SecondaryStorageVmAllocator {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index d89a6d9..5802a80 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -26,6 +26,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.api.Answer;
@@ -124,6 +125,7 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.UserVmDao;
+@Component
@Local(value = { SnapshotManager.class, SnapshotService.class })
public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Manager {
private static final Logger s_logger = Logger.getLogger(SnapshotManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
index 8c09994..97491cd 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
@@ -27,6 +27,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.ApiDispatcher;
import com.cloud.api.ApiGsonHelper;
@@ -60,6 +61,7 @@ import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={SnapshotScheduler.class})
public class SnapshotSchedulerImpl implements SnapshotScheduler {
private static final Logger s_logger = Logger.getLogger(SnapshotSchedulerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
index 8932469..703ee8f 100644
--- a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
+++ b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java
@@ -26,6 +26,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.api.Answer;
@@ -60,6 +61,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value = { SwiftManager.class })
public class SwiftManagerImpl implements SwiftManager {
private static final Logger s_logger = Logger.getLogger(SwiftManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index 4231be8..470d8cb 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -32,6 +32,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.Listener;
@@ -75,6 +76,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao;
/**
* Monitors the progress of upload.
*/
+@Component
@Local(value={UploadMonitor.class})
public class UploadMonitorImpl implements UploadMonitor {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index db32f2c..d148a08 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -25,6 +25,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.commands.ListTagsCmd;
import com.cloud.domain.Domain;
@@ -70,6 +71,7 @@ import com.cloud.uuididentity.dao.IdentityDao;
import com.cloud.vm.dao.UserVmDao;
+@Component
@Local(value = { TaggedResourceService.class})
public class TaggedResourceManagerImpl implements TaggedResourceService, Manager{
public static final Logger s_logger = Logger.getLogger(TaggedResourceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java b/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
index 960e03e..2eb729f 100644
--- a/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
+++ b/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java
@@ -18,6 +18,9 @@ package com.cloud.tags.dao;
import java.util.List;
import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.server.ResourceTag;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.ResourceTagVO;
@@ -26,7 +29,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
-
+@Component
@Local(value = { ResourceTagDao.class })
public class ResourceTagsDaoImpl extends GenericDaoBase<ResourceTagVO, Long> implements ResourceTagDao{
final SearchBuilder<ResourceTagVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
index 24f6aeb..e085d93 100755
--- a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
+++ b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java
@@ -24,6 +24,7 @@ import java.sql.SQLException;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.maint.Version;
import com.cloud.upgrade.dao.VersionDao;
@@ -34,6 +35,7 @@ import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value = {SystemIntegrityChecker.class})
public class DatabaseIntegrityChecker implements SystemIntegrityChecker {
private final Logger s_logger = Logger.getLogger(DatabaseIntegrityChecker.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
index 067f092..193214b 100755
--- a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
@@ -18,6 +18,8 @@ package com.cloud.upgrade;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.upgrade.dao.DbUpgrade;
import com.cloud.upgrade.dao.Upgrade217to218;
import com.cloud.upgrade.dao.Upgrade218to224DomainVlans;
@@ -43,6 +45,7 @@ import com.cloud.upgrade.dao.VersionDaoImpl;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.SystemIntegrityChecker;
+@Component
@Local(value = { SystemIntegrityChecker.class })
public class PremiumDatabaseUpgradeChecker extends DatabaseUpgradeChecker {
public PremiumDatabaseUpgradeChecker() {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
index 6b5f656..5e6e7bc 100644
--- a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java
+++ b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.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.upgrade.dao.VersionVO.Step;
import com.cloud.utils.db.DB;
@@ -37,6 +38,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value = VersionDao.class)
@DB(txn = false)
public class VersionDaoImpl extends GenericDaoBase<VersionVO, Long> implements VersionDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java b/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java
index b6a8f17..bbce5f8 100644
--- a/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.usage.ExternalPublicIpStatisticsVO;
import com.cloud.user.UserStatisticsVO;
import com.cloud.utils.db.GenericDaoBase;
@@ -27,6 +29,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.vm.dao.DomainRouterDao;
+@Component
@Local(value = { ExternalPublicIpStatisticsDao.class })
public class ExternalPublicIpStatisticsDaoImpl extends GenericDaoBase<ExternalPublicIpStatisticsVO, Long> implements ExternalPublicIpStatisticsDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageDaoImpl.java b/server/src/com/cloud/usage/dao/UsageDaoImpl.java
index 3505fdd..f9ae70c 100644
--- a/server/src/com/cloud/usage/dao/UsageDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageDaoImpl.java
@@ -27,6 +27,7 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.exception.UsageServerException;
import com.cloud.usage.UsageVO;
@@ -38,6 +39,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageDao.class})
public class UsageDaoImpl extends GenericDaoBase<UsageVO, Long> implements UsageDao {
public static final Logger s_logger = Logger.getLogger(UsageDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java b/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java
index 78ba4d8..9af4a26 100644
--- a/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.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.usage.UsageIPAddressVO;
import com.cloud.user.Account;
@@ -33,6 +34,7 @@ import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageIPAddressDao.class})
public class UsageIPAddressDaoImpl extends GenericDaoBase<UsageIPAddressVO, Long> implements UsageIPAddressDao {
public static final Logger s_logger = Logger.getLogger(UsageIPAddressDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java b/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java
index d3a338a..3c7a3dc 100644
--- a/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.exception.UsageServerException;
import com.cloud.usage.UsageJobVO;
@@ -32,6 +33,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageJobDao.class})
public class UsageJobDaoImpl extends GenericDaoBase<UsageJobVO, Long> implements UsageJobDao {
private static final Logger s_logger = Logger.getLogger(UsageJobDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java b/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java
index 07d0e6f..fa63223 100644
--- a/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageLoadBalancerPolicyVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageLoadBalancerPolicyDao.class})
public class UsageLoadBalancerPolicyDaoImpl extends GenericDaoBase<UsageLoadBalancerPolicyVO, Long> implements UsageLoadBalancerPolicyDao {
public static final Logger s_logger = Logger.getLogger(UsageLoadBalancerPolicyDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java b/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java
index 2a9ecef..d64fd80 100644
--- a/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java
@@ -24,11 +24,13 @@ import java.util.Map;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageNetworkVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageNetworkDao.class})
public class UsageNetworkDaoImpl extends GenericDaoBase<UsageNetworkVO, Long> implements UsageNetworkDao {
private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java
index 722a548..a6539dd 100644
--- a/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageNetworkOfferingVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageNetworkOfferingDao.class})
public class UsageNetworkOfferingDaoImpl extends GenericDaoBase<UsageNetworkOfferingVO, Long> implements UsageNetworkOfferingDao {
public static final Logger s_logger = Logger.getLogger(UsageNetworkOfferingDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java b/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java
index 5c5e49e..2afc50a 100644
--- a/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsagePortForwardingRuleVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsagePortForwardingRuleDao.class})
public class UsagePortForwardingRuleDaoImpl extends GenericDaoBase<UsagePortForwardingRuleVO, Long> implements UsagePortForwardingRuleDao {
public static final Logger s_logger = Logger.getLogger(UsagePortForwardingRuleDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java b/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
index 4ec2131..7564bf0 100644
--- a/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageSecurityGroupVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageSecurityGroupDao.class})
public class UsageSecurityGroupDaoImpl extends GenericDaoBase<UsageSecurityGroupVO, Long> implements UsageSecurityGroupDao {
public static final Logger s_logger = Logger.getLogger(UsageSecurityGroupDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
index b797890..297c8f4 100644
--- a/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.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.usage.UsageStorageVO;
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={UsageStorageDao.class})
public class UsageStorageDaoImpl extends GenericDaoBase<UsageStorageVO, Long> implements UsageStorageDao {
public static final Logger s_logger = Logger.getLogger(UsageStorageDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java b/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java
index 66ae750..fc82754 100644
--- a/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageVMInstanceVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageVMInstanceDao.class})
public class UsageVMInstanceDaoImpl extends GenericDaoBase<UsageVMInstanceVO, Long> implements UsageVMInstanceDao {
public static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java b/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java
index 8ae277a..d6bf13b 100644
--- a/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageVPNUserVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageVPNUserDao.class})
public class UsageVPNUserDaoImpl extends GenericDaoBase<UsageVPNUserVO, Long> implements UsageVPNUserDao {
public static final Logger s_logger = Logger.getLogger(UsageVPNUserDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java b/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java
index c8831d9..039d8f4 100644
--- a/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java
+++ b/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java
@@ -26,12 +26,14 @@ import java.util.TimeZone;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.usage.UsageVolumeVO;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={UsageVolumeDao.class})
public class UsageVolumeDaoImpl extends GenericDaoBase<UsageVolumeVO, Long> implements UsageVolumeDao {
public static final Logger s_logger = Logger.getLogger(UsageVolumeDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 3fd0e17..c31c6f8 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -38,6 +38,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;
import com.cloud.acl.SecurityChecker;
@@ -142,6 +143,7 @@ import com.cloud.vm.dao.InstanceGroupDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
+@Component
@Local(value = { AccountManager.class, AccountService.class })
public class AccountManagerImpl implements AccountManager, AccountService, Manager {
public static final Logger s_logger = Logger.getLogger(AccountManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/DomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
index 8905be0..598f732 100644
--- a/server/src/com/cloud/user/DomainManagerImpl.java
+++ b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -25,6 +25,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.commands.ListDomainChildrenCmd;
import com.cloud.api.commands.ListDomainsCmd;
@@ -57,6 +58,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
+@Component
@Local(value = { DomainManager.class, DomainService.class })
public class DomainManagerImpl implements DomainManager, DomainService, Manager {
public static final Logger s_logger = Logger.getLogger(DomainManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/user/dao/AccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/dao/AccountDaoImpl.java b/server/src/com/cloud/user/dao/AccountDaoImpl.java
index 7300bb1..ae102a3 100755
--- a/server/src/com/cloud/user/dao/AccountDaoImpl.java
+++ b/server/src/com/cloud/user/dao/AccountDaoImpl.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.user.Account;
import com.cloud.user.Account.State;
@@ -38,6 +39,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value={AccountDao.class})
public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements AccountDao {
private static final Logger s_logger = Logger.getLogger(AccountDaoImpl.class);