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:43 UTC
[6/11] Add Spring annotation to major components
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java b/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java
index bf7cb72..43f7b07 100644
--- a/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java
+++ b/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java
@@ -22,6 +22,8 @@ import java.util.Map;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.host.DetailVO;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.db.GenericDaoBase;
@@ -29,6 +31,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value=HostDetailsDao.class)
public class HostDetailsDaoImpl extends GenericDaoBase<DetailVO, Long> implements HostDetailsDao {
protected final SearchBuilder<DetailVO> HostSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/host/dao/HostTagsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/host/dao/HostTagsDaoImpl.java b/server/src/com/cloud/host/dao/HostTagsDaoImpl.java
index 83ac3cc..e98e7e2 100644
--- a/server/src/com/cloud/host/dao/HostTagsDaoImpl.java
+++ b/server/src/com/cloud/host/dao/HostTagsDaoImpl.java
@@ -21,13 +21,15 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.host.HostTagVO;
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=HostTagsDao.class)
public class HostTagsDaoImpl extends GenericDaoBase<HostTagVO, Long> implements HostTagsDao {
protected final SearchBuilder<HostTagVO> HostSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
index 5dd1694..950f4ec 100755
--- a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java
+++ b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.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.agent.AgentManager;
import com.cloud.agent.StartupCommandProcessor;
@@ -57,6 +58,7 @@ import com.cloud.utils.net.NetUtils;
* Creates a host record and supporting records such as pod and ip address
*
*/
+@Component
@Local(value=StartupCommandProcessor.class)
public class CloudZonesStartupProcessor implements StartupCommandProcessor {
private static final Logger s_logger = Logger.getLogger(CloudZonesStartupProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
index 72a87d0..f01d6d0 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.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.agent.api.Command;
import com.cloud.host.Host;
@@ -33,6 +34,7 @@ import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.Inject;
+@Component
@Local(value = { HypervisorGuruManager.class } )
public class HypervisorGuruManagerImpl implements HypervisorGuruManager {
public static final Logger s_logger = Logger.getLogger(HypervisorGuruManagerImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/hypervisor/KVMGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java
index a756965..3089c13 100644
--- a/server/src/com/cloud/hypervisor/KVMGuru.java
+++ b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -18,6 +18,8 @@ package com.cloud.hypervisor;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.GuestOSVO;
@@ -26,6 +28,7 @@ import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value=HypervisorGuru.class)
public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru {
@Inject GuestOSDao _guestOsDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
index 1a6fb72..21afa81 100644
--- a/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
+++ b/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.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.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorCapabilitiesVO;
@@ -29,6 +30,7 @@ import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value=HypervisorCapabilitiesDao.class)
public class HypervisorCapabilitiesDaoImpl extends GenericDaoBase<HypervisorCapabilitiesVO, Long> implements HypervisorCapabilitiesDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java b/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java
index 6a1cd67..6b617a7 100755
--- a/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java
@@ -28,6 +28,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.agent.api.StartupVMMAgentCommand;
@@ -54,6 +55,7 @@ import com.cloud.utils.nio.NioClient;
import com.cloud.utils.nio.Task;
import com.cloud.utils.nio.Task.Type;
+@Component
@Local(value=Discoverer.class)
public class HypervServerDiscoverer extends DiscovererBase implements Discoverer, HandlerFactory{
private static final Logger s_logger = Logger.getLogger(HypervServerDiscoverer.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
index 03746e7..9a10b39 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.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.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -65,6 +66,7 @@ import com.cloud.utils.component.Inject;
import com.cloud.utils.script.Script;
import com.cloud.utils.ssh.SSHCmdHelper;
+@Component
@Local(value=Discoverer.class)
public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
Listener, ResourceStateAdapter {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/keystore/KeystoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/keystore/KeystoreDaoImpl.java b/server/src/com/cloud/keystore/KeystoreDaoImpl.java
index 2c06138..0ea97c7 100644
--- a/server/src/com/cloud/keystore/KeystoreDaoImpl.java
+++ b/server/src/com/cloud/keystore/KeystoreDaoImpl.java
@@ -22,6 +22,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
@@ -32,6 +34,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import edu.emory.mathcs.backport.java.util.Collections;
+@Component
@Local(value={KeystoreDao.class})
public class KeystoreDaoImpl extends GenericDaoBase<KeystoreVO, Long> implements KeystoreDao {
protected final SearchBuilder<KeystoreVO> FindByNameSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/keystore/KeystoreManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/keystore/KeystoreManagerImpl.java b/server/src/com/cloud/keystore/KeystoreManagerImpl.java
index 6118ac3..ee73988 100644
--- a/server/src/com/cloud/keystore/KeystoreManagerImpl.java
+++ b/server/src/com/cloud/keystore/KeystoreManagerImpl.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.api.SecStorageSetupCommand;
import com.cloud.utils.Ternary;
@@ -39,6 +40,7 @@ import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.security.CertificateHelper;
+@Component
@Local(value=KeystoreManager.class)
public class KeystoreManagerImpl implements KeystoreManager {
private static final Logger s_logger = Logger.getLogger(KeystoreManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/maint/UpgradeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/maint/UpgradeManagerImpl.java b/server/src/com/cloud/maint/UpgradeManagerImpl.java
index b4bc291..0b02598 100644
--- a/server/src/com/cloud/maint/UpgradeManagerImpl.java
+++ b/server/src/com/cloud/maint/UpgradeManagerImpl.java
@@ -37,6 +37,7 @@ import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.maint.dao.AgentUpgradeDao;
@@ -51,6 +52,7 @@ import com.cloud.utils.component.ComponentLocator;
* 2. Spread out a release update to agents so that the entire system
* does not come down at the same time.
*/
+@Component
@Local(UpgradeManager.class)
public class UpgradeManagerImpl implements UpgradeManager {
private final static Logger s_logger = Logger.getLogger(UpgradeManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java b/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java
index 76a9910..80c6d85 100644
--- a/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java
+++ b/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java
@@ -18,9 +18,12 @@ package com.cloud.maint.dao;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.maint.AgentUpgradeVO;
import com.cloud.utils.db.GenericDaoBase;
+@Component
@Local(AgentUpgradeDao.class)
public class AgentUpgradeDaoImpl extends GenericDaoBase<AgentUpgradeVO, Long> implements AgentUpgradeDao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/DiskOffering20DaoImpl.java b/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
index ac1066f..9008961 100644
--- a/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
+++ b/server/src/com/cloud/migration/DiskOffering20DaoImpl.java
@@ -18,8 +18,11 @@ package com.cloud.migration;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDaoBase;
+@Component
@Local(value={DiskOffering20Dao.class})
public class DiskOffering20DaoImpl extends GenericDaoBase<DiskOffering20VO, Long> implements DiskOffering20Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/DiskOffering21DaoImpl.java b/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
index 6de7d8f..4526235 100644
--- a/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
+++ b/server/src/com/cloud/migration/DiskOffering21DaoImpl.java
@@ -18,8 +18,11 @@ package com.cloud.migration;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDaoBase;
+@Component
@Local(value={DiskOffering21Dao.class})
public class DiskOffering21DaoImpl extends GenericDaoBase<DiskOffering21VO, Long> implements DiskOffering21Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java b/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
index 92bde6c..5f3201d 100644
--- a/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
+++ b/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java
@@ -18,8 +18,11 @@ package com.cloud.migration;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDaoBase;
+@Component
@Local(value={ServiceOffering20Dao.class})
public class ServiceOffering20DaoImpl extends GenericDaoBase<ServiceOffering20VO, Long> implements ServiceOffering20Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java b/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
index 0f68fd9..18a4df1 100644
--- a/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
+++ b/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java
@@ -18,8 +18,11 @@ package com.cloud.migration;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDaoBase;
+@Component
@Local(value={ServiceOffering21Dao.class})
public class ServiceOffering21DaoImpl extends GenericDaoBase<ServiceOffering21VO, Long> implements ServiceOffering21Dao {
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/ExteralIpAddressAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExteralIpAddressAllocator.java b/server/src/com/cloud/network/ExteralIpAddressAllocator.java
index 7994535..10024d6 100644
--- a/server/src/com/cloud/network/ExteralIpAddressAllocator.java
+++ b/server/src/com/cloud/network/ExteralIpAddressAllocator.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.configuration.dao.ConfigurationDao;
@@ -38,6 +39,7 @@ import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value=IpAddrAllocator.class)
public class ExteralIpAddressAllocator implements IpAddrAllocator{
private static final Logger s_logger = Logger.getLogger(ExteralIpAddressAllocator.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
index 6749496..0b772ba 100644
--- a/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.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.agent.AgentManager;
import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer;
@@ -75,6 +76,7 @@ import com.cloud.vm.NicVO;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
+@Component
@Local(value = { ExternalLoadBalancerUsageManager.class })
public class ExternalLoadBalancerUsageManagerImpl implements ExternalLoadBalancerUsageManager {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
index dfe720e..feb6c7d 100755
--- a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.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.agent.AgentManager;
import com.cloud.api.ApiConstants;
@@ -74,6 +75,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
+@Component
@Local(value = {ExternalNetworkDeviceManager.class})
public class ExternalNetworkDeviceManagerImpl implements ExternalNetworkDeviceManager {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 25c0032..e291962 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -41,6 +41,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.acl.SecurityChecker.AccessType;
@@ -223,6 +224,7 @@ import edu.emory.mathcs.backport.java.util.Collections;
/**
* NetworkManagerImpl implements NetworkManager.
*/
+@Component
@Local(value = { NetworkManager.class, NetworkService.class })
public class NetworkManagerImpl implements NetworkManager, NetworkService, Manager, Listener {
private static final Logger s_logger = Logger.getLogger(NetworkManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/NetworkUsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java
index 13e5e24..20425ea 100755
--- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.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.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -87,6 +88,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.MacAddress;
+@Component
@Local(value = {NetworkUsageManager.class})
public class NetworkUsageManagerImpl implements NetworkUsageManager, ResourceStateAdapter {
public enum NetworkUsageResourceName {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/StorageNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java
index 598ade6..63cb969 100755
--- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java
+++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.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.api.commands.CreateStorageNetworkIpRangeCmd;
import com.cloud.api.commands.DeleteStorageNetworkIpRangeCmd;
@@ -57,6 +58,7 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.SecondaryStorageVmDao;
import com.cloud.vm.dao.VMInstanceDao;
+@Component
@Local(value = {StorageNetworkManager.class, StorageNetworkService.class})
public class StorageNetworkManagerImpl implements StorageNetworkManager, StorageNetworkService {
private static final Logger s_logger = Logger.getLogger(StorageNetworkManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
index 6c64bbc..ee26df9 100644
--- a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
+++ b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java
@@ -18,6 +18,9 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.network.ExternalFirewallDeviceVO;
import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceAllocationState;
import com.cloud.network.ExternalFirewallDeviceVO.FirewallDeviceState;
@@ -27,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=ExternalFirewallDeviceDao.class) @DB(txn=false)
public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase<ExternalFirewallDeviceVO, Long> implements ExternalFirewallDeviceDao {
final SearchBuilder<ExternalFirewallDeviceVO> physicalNetworkServiceProviderSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
index 18bc29e..6fddfa7 100644
--- a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
+++ b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java
@@ -18,6 +18,9 @@ package com.cloud.network.dao;
import java.util.List;
import javax.ejb.Local;
+
+import org.springframework.stereotype.Component;
+
import com.cloud.network.ExternalLoadBalancerDeviceVO;
import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceAllocationState;
import com.cloud.network.ExternalLoadBalancerDeviceVO.LBDeviceState;
@@ -27,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=ExternalLoadBalancerDeviceDao.class) @DB(txn=false)
public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase<ExternalLoadBalancerDeviceVO, Long> implements ExternalLoadBalancerDeviceDao {
final SearchBuilder<ExternalLoadBalancerDeviceVO> physicalNetworkIdSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
index ee89715..85f3d8e 100644
--- a/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java
+++ b/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.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.FirewallRulesCidrsVO;
import com.cloud.utils.db.DB;
@@ -30,7 +31,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
-
+@Component
@Local(value=FirewallRulesCidrsDao.class)
public class FirewallRulesCidrsDaoImpl extends GenericDaoBase<FirewallRulesCidrsVO, Long> implements FirewallRulesCidrsDao {
private static final Logger s_logger = Logger.getLogger(FirewallRulesCidrsDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
index a2478d8..73fdf22 100644
--- a/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
+++ b/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.IPAddressVO;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.FirewallRule.FirewallRuleType;
@@ -40,6 +42,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value = FirewallRulesDao.class)
@DB(txn = false)
public class FirewallRulesDaoImpl extends GenericDaoBase<FirewallRuleVO, Long> implements FirewallRulesDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/IPAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java b/server/src/com/cloud/network/dao/IPAddressDaoImpl.java
index dba3566..28757d2 100755
--- a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/server/src/com/cloud/network/dao/IPAddressDaoImpl.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.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
@@ -44,6 +45,7 @@ import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.net.Ip;
+@Component
@Local(value = { IPAddressDao.class })
@DB
public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implements IPAddressDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java
index 288e723..1d21d4f 100644
--- a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java
+++ b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java
@@ -18,10 +18,13 @@ package com.cloud.network.dao;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.InlineLoadBalancerNicMapVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={InlineLoadBalancerNicMapDao.class})
public class InlineLoadBalancerNicMapDaoImpl extends GenericDaoBase<InlineLoadBalancerNicMapVO, Long> implements InlineLoadBalancerNicMapDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java b/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java
index a6c34a8..59e31f2 100644
--- a/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java
+++ b/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java
@@ -20,12 +20,13 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.LBStickinessPolicyVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
-
-
+@Component
@Local(value = { LBStickinessPolicyDao.class })
public class LBStickinessPolicyDaoImpl extends
GenericDaoBase<LBStickinessPolicyVO, Long> implements
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
index f624bfa..35f0692 100644
--- a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
+++ b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.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.network.LoadBalancerVO;
import com.cloud.network.rules.FirewallRule.State;
@@ -34,6 +35,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
+@Component
@Local(value = { LoadBalancerDao.class })
public class LoadBalancerDaoImpl extends GenericDaoBase<LoadBalancerVO, Long> implements LoadBalancerDao {
private static final Logger s_logger = Logger.getLogger(LoadBalancerDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java
index ab0e3ab..527b53f 100644
--- a/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java
+++ b/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java
@@ -20,10 +20,13 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.LoadBalancerVMMapVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={LoadBalancerVMMapDao.class})
public class LoadBalancerVMMapDaoImpl extends GenericDaoBase<LoadBalancerVMMapVO, Long> implements LoadBalancerVMMapDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDaoImpl.java
index cbfec89..71fcac9 100644
--- a/server/src/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkDaoImpl.java
@@ -23,6 +23,8 @@ import java.util.Random;
import javax.ejb.Local;
import javax.persistence.TableGenerator;
+import org.springframework.stereotype.Component;
+
import com.cloud.acl.ControlledEntity.ACLType;
import com.cloud.network.Network;
import com.cloud.network.Network.GuestType;
@@ -55,6 +57,7 @@ import com.cloud.utils.db.SequenceFetcher;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.net.NetUtils;
+@Component
@Local(value = NetworkDao.class)
@DB(txn = false)
public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long> implements NetworkDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
index 90c7d6f..ba7bb23 100644
--- a/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.NetworkDomainVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@@ -28,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=NetworkDomainDao.class) @DB(txn=false)
public class NetworkDomainDaoImpl extends GenericDaoBase<NetworkDomainVO, Long> implements NetworkDomainDao {
final SearchBuilder<NetworkDomainVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java b/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
index 7c4a275..a90da61 100644
--- a/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.NetworkExternalFirewallVO;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
@@ -28,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=NetworkExternalFirewallDao.class) @DB(txn=false)
public class NetworkExternalFirewallDaoImpl extends GenericDaoBase<NetworkExternalFirewallVO, Long> implements NetworkExternalFirewallDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
index 334a977..3995d56 100644
--- a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.NetworkExternalLoadBalancerVO;
import com.cloud.utils.db.DB;
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.utils.db.SearchCriteria.Op;
+@Component
@Local(value=NetworkExternalLoadBalancerDao.class) @DB(txn=false)
public class NetworkExternalLoadBalancerDaoImpl extends GenericDaoBase<NetworkExternalLoadBalancerVO, Long> implements NetworkExternalLoadBalancerDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java b/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java
index 298156e..e2cda86 100644
--- a/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java
@@ -18,6 +18,8 @@ package com.cloud.network.dao;
import java.util.List;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.Attribute;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
@@ -27,7 +29,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.UpdateBuilder;
-
+@Component
public class NetworkOpDaoImpl extends GenericDaoBase<NetworkOpVO, Long> implements GenericDao<NetworkOpVO, Long> {
protected final SearchBuilder<NetworkOpVO> AllFieldsSearch;
protected final GenericSearchBuilder<NetworkOpVO, Integer> ActiveNicsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
index fddd3c3..4d8b9d5 100644
--- a/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java
@@ -20,11 +20,14 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.NetworkRuleConfigVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={NetworkRuleConfigDao.class})
public class NetworkRuleConfigDaoImpl extends GenericDaoBase<NetworkRuleConfigVO, Long> implements NetworkRuleConfigDao {
protected SearchBuilder<NetworkRuleConfigVO> SecurityGroupIdSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java b/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
index 51c3992..e603fd8 100644
--- a/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
+++ b/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.exception.UnsupportedServiceException;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
@@ -31,6 +33,7 @@ import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value=NetworkServiceMapDao.class) @DB(txn=false)
public class NetworkServiceMapDaoImpl extends GenericDaoBase<NetworkServiceMapVO, Long> implements NetworkServiceMapDao {
final SearchBuilder<NetworkServiceMapVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
index 792ead5..d96da60 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PhysicalNetworkVO;
import com.cloud.utils.component.ComponentLocator;
@@ -32,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=PhysicalNetworkDao.class) @DB(txn=false)
public class PhysicalNetworkDaoImpl extends GenericDaoBase<PhysicalNetworkVO, Long> implements PhysicalNetworkDao {
final SearchBuilder<PhysicalNetworkVO> ZoneSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
index 873a28c..04508e7 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java
@@ -18,6 +18,8 @@ package com.cloud.network.dao;
import java.util.List;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
@@ -25,7 +27,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
-
+@Component
public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements GenericDao<PhysicalNetworkIsolationMethodVO, Long> {
private final GenericSearchBuilder<PhysicalNetworkIsolationMethodVO, String> IsolationMethodSearch;
private final SearchBuilder<PhysicalNetworkIsolationMethodVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
index 0fc9806..16a23dd 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.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.PhysicalNetworkServiceProvider;
import com.cloud.utils.db.DB;
@@ -28,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=PhysicalNetworkServiceProviderDao.class) @DB(txn=false)
public class PhysicalNetworkServiceProviderDaoImpl extends GenericDaoBase<PhysicalNetworkServiceProviderVO, Long> implements PhysicalNetworkServiceProviderDao {
final SearchBuilder<PhysicalNetworkServiceProviderVO> physicalNetworkSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java
index a1c98a7..c3e9f73 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java
@@ -18,6 +18,8 @@ package com.cloud.network.dao;
import java.util.List;
+import org.springframework.stereotype.Component;
+
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
@@ -25,7 +27,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
-
+@Component
public class PhysicalNetworkTagDaoImpl extends GenericDaoBase<PhysicalNetworkTagVO, Long> implements GenericDao<PhysicalNetworkTagVO, Long> {
private final GenericSearchBuilder<PhysicalNetworkTagVO, String> TagSearch;
private final SearchBuilder<PhysicalNetworkTagVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
index c89477d..b93219a 100755
--- a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.utils.db.DB;
@@ -29,6 +31,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=PhysicalNetworkTrafficTypeDao.class) @DB(txn=false)
public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNetworkTrafficTypeVO, Long> implements PhysicalNetworkTrafficTypeDao {
final SearchBuilder<PhysicalNetworkTrafficTypeVO> physicalNetworkSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/PortProfileDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PortProfileDaoImpl.java b/server/src/com/cloud/network/dao/PortProfileDaoImpl.java
index dda2d3c..80e6368 100644
--- a/server/src/com/cloud/network/dao/PortProfileDaoImpl.java
+++ b/server/src/com/cloud/network/dao/PortProfileDaoImpl.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.network.PortProfileVO;
import com.cloud.utils.db.DB;
@@ -33,6 +34,7 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.exception.CloudRuntimeException;
+@Component
@Local(value=PortProfileDao.class) @DB(txn=false)
public class PortProfileDaoImpl extends GenericDaoBase<PortProfileVO, Long> implements PortProfileDao {
protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java
index e9be500..d91226e 100644
--- a/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java
+++ b/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.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.network.RemoteAccessVpn;
import com.cloud.network.RemoteAccessVpnVO;
@@ -28,6 +29,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={RemoteAccessVpnDao.class})
public class RemoteAccessVpnDaoImpl extends GenericDaoBase<RemoteAccessVpnVO, Long> implements RemoteAccessVpnDao {
private static final Logger s_logger = Logger.getLogger(RemoteAccessVpnDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
index e1eed28..06c6f8a 100644
--- a/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
+++ b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java
@@ -18,6 +18,8 @@ package com.cloud.network.dao;
import java.util.List;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.RouterNetworkVO;
import com.cloud.utils.db.GenericDao;
import com.cloud.utils.db.GenericDaoBase;
@@ -26,7 +28,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
-
+@Component
public class RouterNetworkDaoImpl extends GenericDaoBase<RouterNetworkVO, Long> implements GenericDao<RouterNetworkVO, Long>{
protected final GenericSearchBuilder<RouterNetworkVO, Long> RouterNetworksSearch;
protected final SearchBuilder<RouterNetworkVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
index bf6900d..449b2a9 100644
--- a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
+++ b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.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.network.Site2SiteCustomerGatewayVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={Site2SiteCustomerGatewayDao.class})
public class Site2SiteCustomerGatewayDaoImpl extends GenericDaoBase<Site2SiteCustomerGatewayVO, Long> implements Site2SiteCustomerGatewayDao {
private static final Logger s_logger = Logger.getLogger(Site2SiteCustomerGatewayDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java
index b1f9ef7..5e5e34e 100644
--- a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java
+++ b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.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.network.IPAddressVO;
import com.cloud.network.Site2SiteVpnConnectionVO;
@@ -31,6 +32,7 @@ import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={Site2SiteVpnConnectionDao.class})
public class Site2SiteVpnConnectionDaoImpl extends GenericDaoBase<Site2SiteVpnConnectionVO, Long> implements Site2SiteVpnConnectionDao {
private static final Logger s_logger = Logger.getLogger(Site2SiteVpnConnectionDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
index 31a8f0e..5bf4b94 100644
--- a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
+++ b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java
@@ -19,6 +19,7 @@ package com.cloud.network.dao;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.network.Site2SiteVpnGatewayVO;
import com.cloud.utils.component.ComponentLocator;
@@ -26,6 +27,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={Site2SiteVpnGatewayDao.class})
public class Site2SiteVpnGatewayDaoImpl extends GenericDaoBase<Site2SiteVpnGatewayVO, Long> implements Site2SiteVpnGatewayDao {
protected final IPAddressDaoImpl _addrDao = ComponentLocator.inject(IPAddressDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java b/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
index a9be516..dba835f 100644
--- a/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
+++ b/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.element.VirtualRouterProviderVO;
import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
import com.cloud.utils.db.DB;
@@ -27,6 +29,7 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value=VirtualRouterProviderDao.class) @DB(txn=false)
public class VirtualRouterProviderDaoImpl extends GenericDaoBase<VirtualRouterProviderVO, Long> implements VirtualRouterProviderDao {
final SearchBuilder<VirtualRouterProviderVO> AllFieldsSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/dao/VpnUserDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/VpnUserDaoImpl.java b/server/src/com/cloud/network/dao/VpnUserDaoImpl.java
index eca8926..cd3de79 100644
--- a/server/src/com/cloud/network/dao/VpnUserDaoImpl.java
+++ b/server/src/com/cloud/network/dao/VpnUserDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.VpnUser.State;
import com.cloud.network.VpnUserVO;
import com.cloud.utils.db.GenericDaoBase;
@@ -28,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Func;
+@Component
@Local(value={VpnUserDao.class})
public class VpnUserDaoImpl extends GenericDaoBase<VpnUserVO, Long> implements VpnUserDao {
private final SearchBuilder<VpnUserVO> AccountSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/element/BareMetalElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/BareMetalElement.java b/server/src/com/cloud/network/element/BareMetalElement.java
index 842af83..dbad2e8 100644
--- a/server/src/com/cloud/network/element/BareMetalElement.java
+++ b/server/src/com/cloud/network/element/BareMetalElement.java
@@ -23,6 +23,7 @@ import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.baremetal.ExternalDhcpManager;
import com.cloud.deploy.DeployDestination;
@@ -48,6 +49,7 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.NicDao;
+@Component
@Local(value=NetworkElement.class)
public class BareMetalElement extends AdapterBase implements NetworkElement {
private static final Logger s_logger = Logger.getLogger(BareMetalElement.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
index ca88a72..e57a832 100644
--- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
+++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
@@ -24,6 +24,7 @@ import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.AgentManager.OnError;
@@ -63,6 +64,7 @@ import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.UserVmDao;
+@Component
@Local(value = NetworkElement.class)
public class CloudZonesNetworkElement extends AdapterBase implements NetworkElement, UserDataServiceProvider {
private static final Logger s_logger = Logger.getLogger(CloudZonesNetworkElement.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/element/ExternalDhcpElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/ExternalDhcpElement.java b/server/src/com/cloud/network/element/ExternalDhcpElement.java
index 896cd85..3e77e66 100755
--- a/server/src/com/cloud/network/element/ExternalDhcpElement.java
+++ b/server/src/com/cloud/network/element/ExternalDhcpElement.java
@@ -24,6 +24,7 @@ import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.baremetal.ExternalDhcpManager;
import com.cloud.dc.DataCenter;
@@ -50,6 +51,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value = NetworkElement.class)
public class ExternalDhcpElement extends AdapterBase implements NetworkElement, DhcpServiceProvider {
private static final Logger s_logger = Logger.getLogger(ExternalDhcpElement.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/element/SecurityGroupElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/SecurityGroupElement.java b/server/src/com/cloud/network/element/SecurityGroupElement.java
index 26b33c9..09b8df7 100644
--- a/server/src/com/cloud/network/element/SecurityGroupElement.java
+++ b/server/src/com/cloud/network/element/SecurityGroupElement.java
@@ -23,6 +23,8 @@ import java.util.Set;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -40,6 +42,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value=NetworkElement.class)
public class SecurityGroupElement extends AdapterBase implements NetworkElement {
private static final Map<Service, Map<Capability, String>> capabilities = setCapabilities();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index f3941b6..c5fc57d 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.commands.ConfigureVirtualRouterElementCmd;
import com.cloud.api.commands.ListVirtualRouterElementsCmd;
@@ -88,6 +89,7 @@ import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.UserVmDao;
import com.google.gson.Gson;
+@Component
@Local(value = NetworkElement.class)
public class VirtualRouterElement extends AdapterBase implements VirtualRouterElementService, DhcpServiceProvider,
UserDataServiceProvider, SourceNatServiceProvider, StaticNatServiceProvider, FirewallServiceProvider,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 77ae4d4..ad38e45 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenter;
import com.cloud.deploy.DeployDestination;
@@ -61,6 +62,8 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.VirtualMachineProfile;
+
+@Component
@Local(value = NetworkElement.class)
public class VpcVirtualRouterElement extends VirtualRouterElement implements VpcProvider, Site2SiteVpnServiceProvider, NetworkACLServiceProvider{
private static final Logger s_logger = Logger.getLogger(VpcVirtualRouterElement.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index 82aa9d2..43948c9 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.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.commands.ListFirewallRulesCmd;
import com.cloud.configuration.Config;
@@ -81,6 +82,7 @@ import com.cloud.utils.net.NetUtils;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.dao.UserVmDao;
+@Component
@Local(value = { FirewallService.class, FirewallManager.class})
public class FirewallManagerImpl implements FirewallService, FirewallManager, Manager {
private static final Logger s_logger = Logger.getLogger(FirewallManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 934cd70..4e09c1b 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -22,6 +22,7 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
@@ -54,6 +55,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value={NetworkGuru.class})
public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(ControlNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/DirectNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
index ee824af..fd7159e 100755
--- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java
@@ -19,6 +19,7 @@ package com.cloud.network.guru;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
@@ -55,6 +56,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value = { NetworkGuru.class })
public class DirectNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(DirectNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
index 354d7ed..f936008 100755
--- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
@@ -21,6 +21,7 @@ import java.net.URI;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.ZoneConfig;
import com.cloud.dc.DataCenter;
@@ -56,6 +57,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value = NetworkGuru.class)
public class DirectPodBasedNetworkGuru extends DirectNetworkGuru {
private static final Logger s_logger = Logger.getLogger(DirectPodBasedNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
index 24d24f8..a5019a1 100644
--- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.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.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
@@ -62,6 +63,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value = NetworkGuru.class)
public class ExternalGuestNetworkGuru extends GuestNetworkGuru {
private static final Logger s_logger = Logger.getLogger(ExternalGuestNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/GuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
index cebfb08..d34007f 100755
--- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
@@ -26,6 +26,7 @@ import java.util.TreeSet;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
@@ -76,6 +77,7 @@ import com.cloud.vm.dao.NicDao;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
+@Component
@Local(value = NetworkGuru.class)
public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(GuestNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
index b513325..10ebb13 100755
--- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
@@ -21,6 +21,7 @@ import java.util.Random;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.dc.Pod;
import com.cloud.dc.dao.DataCenterDao;
@@ -49,6 +50,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value={NetworkGuru.class})
public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(PodBasedNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
index 9d4c9c3..4a79579 100644
--- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java
@@ -19,6 +19,7 @@ package com.cloud.network.guru;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.dc.DataCenter;
@@ -54,6 +55,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value = NetworkGuru.class)
public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(PrivateNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/PublicNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java
index ddee5a5..74c0830 100755
--- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java
@@ -19,6 +19,7 @@ package com.cloud.network.guru;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.dc.DataCenter;
import com.cloud.dc.Vlan.VlanType;
@@ -55,6 +56,7 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+@Component
@Local(value = { NetworkGuru.class })
public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(PublicNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/guru/StorageNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java
index 879d0cd..a6b30de 100755
--- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java
@@ -19,6 +19,7 @@ package com.cloud.network.guru;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.dc.Pod;
import com.cloud.dc.StorageNetworkIpAddressVO;
@@ -48,6 +49,7 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.Nic.ReservationStrategy;
+@Component
@Local(value = NetworkGuru.class)
public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru {
private static final Logger s_logger = Logger.getLogger(StorageNetworkGuru.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index ba9923f..04a86c3 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.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.api.commands.CreateLBStickinessPolicyCmd;
import com.cloud.api.commands.CreateLoadBalancerRuleCmd;
@@ -114,6 +115,7 @@ import com.cloud.vm.dao.UserVmDao;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+@Component
@Local(value = { LoadBalancingRulesManager.class, LoadBalancingRulesService.class })
public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesManager, LoadBalancingRulesService, Manager {
private static final Logger s_logger = Logger.getLogger(LoadBalancingRulesManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 943c85f..c942aad 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.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;
@@ -232,6 +233,7 @@ import com.cloud.vm.dao.UserVmDetailsDao;
/**
* VirtualNetworkApplianceManagerImpl manages the different types of virtual network appliances available in the Cloud Stack.
*/
+@Component
@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class })
public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService,
VirtualMachineGuru<DomainRouterVO>, Listener {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 3139998..ac73cac 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -27,6 +27,7 @@ import java.util.TreeSet;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager.OnError;
import com.cloud.agent.api.Command;
@@ -125,6 +126,7 @@ import com.cloud.vm.VirtualMachineProfile.Param;
import com.cloud.vm.dao.VMInstanceDao;
+@Component
@Local(value = {VpcVirtualNetworkApplianceManager.class, VpcVirtualNetworkApplianceService.class})
public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplianceManagerImpl implements VpcVirtualNetworkApplianceManager{
private static final Logger s_logger = Logger.getLogger(VpcVirtualNetworkApplianceManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 2383366..e7c720f 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.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.api.commands.ListPortForwardingRulesCmd;
import com.cloud.configuration.ConfigurationManager;
@@ -80,6 +81,7 @@ import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.UserVmDao;
+@Component
@Local(value = { RulesManager.class, RulesService.class })
public class RulesManagerImpl implements RulesManager, RulesService, Manager {
private static final Logger s_logger = Logger.getLogger(RulesManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
index 9363c1f..64c3f50 100644
--- a/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
+++ b/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.dao.FirewallRulesCidrsDaoImpl;
import com.cloud.network.rules.FirewallRule.Purpose;
import com.cloud.network.rules.FirewallRule.State;
@@ -30,6 +32,7 @@ import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+@Component
@Local(value=PortForwardingRulesDao.class)
public class PortForwardingRulesDaoImpl extends GenericDaoBase<PortForwardingRuleVO, Long> implements PortForwardingRulesDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index a1ed6d7..a1ab8a2 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -38,6 +38,7 @@ import javax.naming.ConfigurationException;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.NetworkRulesSystemVmCommand;
@@ -117,6 +118,7 @@ import com.cloud.vm.dao.VMInstanceDao;
import edu.emory.mathcs.backport.java.util.Collections;
+@Component
@Local(value = { SecurityGroupManager.class, SecurityGroupService.class })
public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityGroupService, Manager, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
index 1f50264..eafb9bb 100644
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java
@@ -27,6 +27,8 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
+import org.springframework.stereotype.Component;
+
import com.cloud.agent.api.SecurityGroupRulesCmd;
import com.cloud.agent.manager.Commands;
import com.cloud.configuration.Config;
@@ -44,6 +46,7 @@ import com.cloud.network.security.SecurityRule.SecurityRuleType;
* Same as the base class -- except it uses the abstracted security group work queue
*
*/
+@Component
@Local(value={ SecurityGroupManager.class, SecurityGroupService.class })
public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl{
SecurityGroupWorkQueue _workQueue = new LocalSecurityGroupWorkQueue();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
index 81c20e3..27ab309 100644
--- a/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.security.SecurityGroupVO;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.tags.dao.ResourceTagsDaoImpl;
@@ -29,7 +31,8 @@ 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={SecurityGroupDao.class})
public class SecurityGroupDaoImpl extends GenericDaoBase<SecurityGroupVO, Long> implements SecurityGroupDao {
private SearchBuilder<SecurityGroupVO> AccountIdSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java
index 0dc9325..bbce53f 100644
--- a/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.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.network.security.SecurityGroupRuleVO;
import com.cloud.network.security.SecurityGroupVO;
import com.cloud.network.security.SecurityRule.SecurityRuleType;
@@ -31,6 +33,7 @@ import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={SecurityGroupRuleDao.class})
public class SecurityGroupRuleDaoImpl extends GenericDaoBase<SecurityGroupRuleVO, Long> implements SecurityGroupRuleDao {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java
index 798fa4f..f08ca05 100644
--- a/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java
@@ -20,12 +20,15 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.network.security.SecurityGroupRulesVO;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
+@Component
@Local(value={SecurityGroupRulesDao.class})
public class SecurityGroupRulesDaoImpl extends GenericDaoBase<SecurityGroupRulesVO, Long> implements SecurityGroupRulesDao {
private SearchBuilder<SecurityGroupRulesVO> AccountGroupNameSearch;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8724e6e9/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java
index db6c002..da07e8b 100644
--- a/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java
@@ -20,6 +20,8 @@ import java.util.List;
import javax.ejb.Local;
+import org.springframework.stereotype.Component;
+
import com.cloud.dc.VlanVO;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.network.IPAddressVO;
@@ -33,6 +35,7 @@ import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.vm.VirtualMachine.State;
+@Component
@Local(value={SecurityGroupVMMapDao.class})
public class SecurityGroupVMMapDaoImpl extends GenericDaoBase<SecurityGroupVMMapVO, Long> implements SecurityGroupVMMapDao {
private SearchBuilder<SecurityGroupVMMapVO> ListByIpAndVmId;