From 2be270de89f1063cf0630ad4a23c23d5cd3599ba Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Wed, 16 Jan 2013 16:33:59 -0800 Subject: [PATCH] Separate loadable components like Gurus, Elements, Adapters to componentContext.xml --- client/tomcatconf/componentContext.xml.in | 167 +++++++++++++++++- .../acl/StaticRoleBasedAPIAccessChecker.java | 1 - .../deploy/UserConcentratedPodPlanner.java | 2 - .../cloud/deploy/UserDispersingPlanner.java | 2 - .../cloud/ovm/hypervisor/OvmDiscoverer.java | 2 - .../com/cloud/ovm/hypervisor/OvmFencer.java | 14 +- .../src/com/cloud/ovm/hypervisor/OvmGuru.java | 3 - .../xen/src/com/cloud/ha/XenServerFencer.java | 5 +- .../com/cloud/hypervisor/XenServerGuru.java | 5 - .../xen/discoverer/XcpServerDiscoverer.java | 2 - .../guru/NiciraNvpGuestNetworkGuru.java | 3 - .../network/guru/OvsGuestNetworkGuru.java | 9 - .../server/auth/LDAPUserAuthenticator.java | 3 - .../server/auth/MD5UserAuthenticator.java | 4 - .../allocator/impl/FirstFitAllocator.java | 10 +- .../impl/FirstFitRoutingAllocator.java | 2 - .../impl/UserConcentratedAllocator.java | 14 +- .../cloud/baremetal/BareMetalDiscoverer.java | 2 - .../com/cloud/baremetal/BareMetalGuru.java | 4 - .../ConsoleProxyBalanceAllocator.java | 13 +- .../com/cloud/deploy/BareMetalPlanner.java | 12 +- .../src/com/cloud/deploy/FirstFitPlanner.java | 2 - .../cloud/ha/AbstractInvestigatorImpl.java | 10 +- .../cloud/ha/CheckOnAgentInvestigator.java | 2 - server/src/com/cloud/ha/KVMFencer.java | 12 +- .../ha/ManagementIPSystemVMInvestigator.java | 2 - .../com/cloud/ha/UserVmDomRInvestigator.java | 2 - .../com/cloud/ha/XenServerInvestigator.java | 2 - server/src/com/cloud/hypervisor/KVMGuru.java | 3 - .../com/cloud/hypervisor/guru/HypervGuru.java | 1 - .../hyperv/HypervServerDiscoverer.java | 2 - .../kvm/discoverer/KvmServerDiscoverer.java | 2 - .../network/ExteralIpAddressAllocator.java | 5 +- .../network/guru/ControlNetworkGuru.java | 2 - .../cloud/network/guru/DirectNetworkGuru.java | 2 - .../guru/DirectPodBasedNetworkGuru.java | 2 - .../guru/ExternalGuestNetworkGuru.java | 5 - .../network/guru/PodBasedNetworkGuru.java | 2 - .../network/guru/PrivateNetworkGuru.java | 2 - .../cloud/network/guru/PublicNetworkGuru.java | 2 - .../network/guru/StorageNetworkGuru.java | 5 - .../com/cloud/resource/DiscovererBase.java | 10 +- .../server/auth/DefaultUserAuthenticator.java | 4 +- .../FirstFitStoragePoolAllocator.java | 2 - .../allocator/LocalStoragePoolAllocator.java | 2 - .../secondary/SecondaryStorageDiscoverer.java | 2 - .../cloud/utils/component/AdapterBase.java | 3 + 47 files changed, 190 insertions(+), 179 deletions(-) diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 5f2b6d6b666..49eb55b27c8 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -65,12 +65,173 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java index 2eaa6b03bb5..f51a63ac752 100644 --- a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java +++ b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java @@ -43,7 +43,6 @@ import com.cloud.utils.component.PluggableService; // This is the default API access checker that grab's the user's account // based on the account type, access is granted -@Component @Local(value=APIChecker.class) public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIChecker { diff --git a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java b/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java index 9e2d08a5b62..2ab98566e0a 100644 --- a/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java +++ b/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java @@ -23,14 +23,12 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=DeploymentPlanner.class) public class UserConcentratedPodPlanner extends FirstFitPlanner implements DeploymentPlanner { diff --git a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java index 0f940031073..2db2051389d 100755 --- a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java +++ b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java @@ -27,7 +27,6 @@ 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.hypervisor.Hypervisor.HypervisorType; @@ -36,7 +35,6 @@ import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=DeploymentPlanner.class) public class UserDispersingPlanner extends FirstFitPlanner implements DeploymentPlanner { diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java index b883cca05fa..1d8f4f06c56 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java @@ -30,7 +30,6 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.agent.api.StartupCommand; @@ -54,7 +53,6 @@ import com.cloud.utils.db.SearchCriteria2; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.ssh.SSHCmdHelper; -@Component @Local(value = Discoverer.class) public class OvmDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java index 3a474995e7f..7aefcaa6f12 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.FenceAnswer; @@ -34,31 +33,22 @@ import com.cloud.exception.OperationTimedoutException; import com.cloud.ha.FenceBuilder; import com.cloud.host.HostVO; import com.cloud.host.Status; -import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VMInstanceVO; import com.cloud.resource.ResourceManager; -@Component @Local(value=FenceBuilder.class) -public class OvmFencer implements FenceBuilder { +public class OvmFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(OvmFencer.class); - String _name; @Inject AgentManager _agentMgr; @Inject ResourceManager _resourceMgr; @Override public boolean configure(String name, Map params) throws ConfigurationException { - _name = name; return true; } - @Override - public String getName() { - // TODO Auto-generated method stub - return _name; - } - @Override public boolean start() { // TODO Auto-generated method stub diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java index 4ded83ed20d..cb2cb13f915 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java @@ -19,8 +19,6 @@ package com.cloud.ovm.hypervisor; import javax.ejb.Local; import javax.inject.Inject; -import org.springframework.stereotype.Component; - import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.HypervisorGuru; import com.cloud.hypervisor.HypervisorGuruBase; @@ -30,7 +28,6 @@ import com.cloud.storage.dao.GuestOSDao; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=HypervisorGuru.class) public class OvmGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java index e70b7cf2aac..737b3b2890b 100755 --- a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java +++ b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java @@ -24,7 +24,6 @@ import javax.inject.Inject; 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; @@ -37,11 +36,11 @@ import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.resource.ResourceManager; +import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VMInstanceVO; -@Component @Local(value=FenceBuilder.class) -public class XenServerFencer implements FenceBuilder { +public class XenServerFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(XenServerFencer.class); String _name; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java index 9fc77a94ff6..8c38a696c00 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java @@ -19,19 +19,14 @@ package com.cloud.hypervisor; import javax.ejb.Local; import javax.inject.Inject; -import org.springframework.stereotype.Component; - import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.GuestOSVO; -import com.cloud.storage.Storage; import com.cloud.storage.dao.GuestOSDao; -import com.cloud.template.VirtualMachineTemplate; import com.cloud.template.VirtualMachineTemplate.BootloaderType; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=HypervisorGuru.class) public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 46eaa725f1e..65a97a8de31 100755 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -33,7 +33,6 @@ import javax.persistence.EntityExistsException; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -99,7 +98,6 @@ import com.xensource.xenapi.Session; import com.xensource.xenapi.Types.SessionAuthenticationFailed; import com.xensource.xenapi.Types.XenAPIException; -@Component @Local(value=Discoverer.class) public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(XcpServerDiscoverer.class); diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java index fa0667b02d3..cdf8edfbfb5 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java @@ -24,7 +24,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.CreateLogicalSwitchAnswer; @@ -54,7 +53,6 @@ import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.NetworkDao; -import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.NiciraNvpDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.offering.NetworkOffering; @@ -67,7 +65,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=NetworkGuru.class) public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(NiciraNvpGuestNetworkGuru.class); diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java index 418d607b7bc..4591d9e6920 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java @@ -16,13 +16,10 @@ // under the License. package com.cloud.network.guru; -import java.util.List; - import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; @@ -31,7 +28,6 @@ import com.cloud.deploy.DeploymentPlan; import com.cloud.event.EventTypes; import com.cloud.event.EventUtils; import com.cloud.event.EventVO; -import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; import com.cloud.network.NetworkManager; @@ -40,18 +36,13 @@ import com.cloud.network.ovs.OvsTunnelManager; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.user.UserContext; -import com.cloud.vm.Nic.ReservationStrategy; -import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachineProfile; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.State; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; -@Component @Local(value=NetworkGuru.class) public class OvsGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(OvsGuestNetworkGuru.class); diff --git a/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java b/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java index 23b7a855019..fb0273e6ea3 100644 --- a/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java +++ b/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java @@ -34,15 +34,12 @@ import javax.naming.directory.SearchResult; import org.apache.cloudstack.api.ApiConstants.LDAPParams; import org.apache.log4j.Logger; import org.bouncycastle.util.encoders.Base64; -import org.springframework.stereotype.Component; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.user.UserAccount; import com.cloud.user.dao.UserAccountDao; import com.cloud.utils.exception.CloudRuntimeException; - -@Component @Local(value={UserAuthenticator.class}) public class LDAPUserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(LDAPUserAuthenticator.class); diff --git a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java index 43d35662ee9..026125ea0f6 100644 --- a/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java +++ b/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java @@ -25,9 +25,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import com.cloud.server.ManagementServer; import com.cloud.user.UserAccount; import com.cloud.user.dao.UserAccountDao; @@ -38,7 +35,6 @@ import com.cloud.utils.exception.CloudRuntimeException; * comparing it against the local database. * */ -@Component @Local(value={UserAuthenticator.class}) public class MD5UserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(MD5UserAuthenticator.class); diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java index c43f8ea395b..a25e4014dea 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java @@ -50,6 +50,7 @@ import com.cloud.storage.dao.GuestOSCategoryDao; import com.cloud.storage.dao.GuestOSDao; import com.cloud.user.Account; import com.cloud.utils.NumbersUtil; +import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.ConsoleProxyDao; @@ -63,9 +64,8 @@ import com.cloud.vm.dao.VMInstanceDao; */ @Component @Local(value={HostAllocator.class}) -public class FirstFitAllocator implements HostAllocator { +public class FirstFitAllocator extends AdapterBase implements HostAllocator { private static final Logger s_logger = Logger.getLogger(FirstFitAllocator.class); - private String _name; @Inject HostDao _hostDao = null; @Inject HostDetailsDao _hostDetailsDao = null; @Inject UserVmDao _vmDao = null; @@ -392,7 +392,6 @@ public class FirstFitAllocator implements HostAllocator { @Override public boolean configure(String name, Map params) throws ConfigurationException { - _name = name; if (_configDao != null) { Map configs = _configDao.getConfiguration(params); String opFactor = configs.get("cpu.overprovisioning.factor"); @@ -408,11 +407,6 @@ public class FirstFitAllocator implements HostAllocator { return true; } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { return true; diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java index 73155fd0023..102c6a56358 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import javax.ejb.Local; import org.apache.log4j.NDC; -import org.springframework.stereotype.Component; import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.deploy.DeploymentPlan; @@ -30,7 +29,6 @@ import com.cloud.host.Host.Type; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value={HostAllocator.class}) public class FirstFitRoutingAllocator extends FirstFitAllocator { @Override diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java index 5f7bc09ac55..29e1be9547c 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java @@ -28,7 +28,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.manager.allocator.PodAllocator; import com.cloud.capacity.CapacityVO; @@ -50,6 +49,7 @@ import com.cloud.template.VirtualMachineTemplate; import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; +import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; @@ -59,13 +59,10 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Component @Local(value = PodAllocator.class) -public class UserConcentratedAllocator implements PodAllocator { +public class UserConcentratedAllocator extends AdapterBase implements PodAllocator { private final static Logger s_logger = Logger.getLogger(UserConcentratedAllocator.class); - String _name; - @Inject UserVmDao _vmDao; @Inject @@ -293,11 +290,6 @@ public class UserConcentratedAllocator implements PodAllocator { */ } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { return true; @@ -310,8 +302,6 @@ public class UserConcentratedAllocator implements PodAllocator { @Override public boolean configure(String name, Map params) throws ConfigurationException { - _name = name; - Map configs = _configDao.getConfiguration("management-server", params); String stoppedValue = configs.get("vm.resource.release.interval"); // String destroyedValue = configs.get("capacity.skipcounting.destroyed.hours"); diff --git a/server/src/com/cloud/baremetal/BareMetalDiscoverer.java b/server/src/com/cloud/baremetal/BareMetalDiscoverer.java index eb168da44a7..e7518853ef0 100755 --- a/server/src/com/cloud/baremetal/BareMetalDiscoverer.java +++ b/server/src/com/cloud/baremetal/BareMetalDiscoverer.java @@ -28,7 +28,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; @@ -58,7 +57,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.VMInstanceDao; -@Component @Local(value=Discoverer.class) public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(BareMetalDiscoverer.class); diff --git a/server/src/com/cloud/baremetal/BareMetalGuru.java b/server/src/com/cloud/baremetal/BareMetalGuru.java index 0ed7719f8a6..9268415b08d 100755 --- a/server/src/com/cloud/baremetal/BareMetalGuru.java +++ b/server/src/com/cloud/baremetal/BareMetalGuru.java @@ -19,10 +19,7 @@ package com.cloud.baremetal; import javax.ejb.Local; import javax.inject.Inject; -import org.springframework.stereotype.Component; - import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.HypervisorGuru; import com.cloud.hypervisor.HypervisorGuruBase; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -31,7 +28,6 @@ import com.cloud.storage.dao.GuestOSDao; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=HypervisorGuru.class) public class BareMetalGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java index 0a045eb9602..45f0faae433 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java @@ -25,17 +25,14 @@ import java.util.Random; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.springframework.stereotype.Component; - +import com.cloud.utils.component.AdapterBase; import com.cloud.vm.ConsoleProxyVO; import edu.emory.mathcs.backport.java.util.Collections; -@Component @Local(value={ConsoleProxyAllocator.class}) -public class ConsoleProxyBalanceAllocator implements ConsoleProxyAllocator { +public class ConsoleProxyBalanceAllocator extends AdapterBase implements ConsoleProxyAllocator { - private String _name; private final Random _rand = new Random(System.currentTimeMillis()); @Override @@ -77,15 +74,9 @@ public class ConsoleProxyBalanceAllocator implements ConsoleProxyAllocator { @Override public boolean configure(String name, Map params) throws ConfigurationException { - _name = name; return true; } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { return true; diff --git a/server/src/com/cloud/deploy/BareMetalPlanner.java b/server/src/com/cloud/deploy/BareMetalPlanner.java index 5d0bd766838..b06e637d9a3 100755 --- a/server/src/com/cloud/deploy/BareMetalPlanner.java +++ b/server/src/com/cloud/deploy/BareMetalPlanner.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.capacity.CapacityManager; import com.cloud.configuration.Config; @@ -44,12 +43,12 @@ import com.cloud.offering.ServiceOffering; import com.cloud.org.Cluster; import com.cloud.resource.ResourceManager; import com.cloud.utils.NumbersUtil; +import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=DeploymentPlanner.class) -public class BareMetalPlanner implements DeploymentPlanner { +public class BareMetalPlanner extends AdapterBase implements DeploymentPlanner { private static final Logger s_logger = Logger.getLogger(BareMetalPlanner.class); @Inject protected DataCenterDao _dcDao; @Inject protected HostPodDao _podDao; @@ -58,7 +57,6 @@ public class BareMetalPlanner implements DeploymentPlanner { @Inject protected ConfigurationDao _configDao; @Inject protected CapacityManager _capacityMgr; @Inject protected ResourceManager _resourceMgr; - String _name; @Override public DeployDestination plan(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid) throws InsufficientServerCapacityException { @@ -144,15 +142,9 @@ public class BareMetalPlanner implements DeploymentPlanner { @Override public boolean configure(String name, Map params) throws ConfigurationException { - _name = name; return true; } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { return true; diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index 3517bf8ed14..c0b72e772de 100755 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.java @@ -28,7 +28,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.api.ApiDBUtils; @@ -80,7 +79,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Component @Local(value=DeploymentPlanner.class) public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { private static final Logger s_logger = Logger.getLogger(FirstFitPlanner.class); diff --git a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java index a6b96522bd3..73fab300885 100755 --- a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java +++ b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java @@ -37,14 +37,14 @@ import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.resource.ResourceManager; +import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.SearchCriteria2; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.SearchCriteriaService; -public abstract class AbstractInvestigatorImpl implements Investigator { +public abstract class AbstractInvestigatorImpl extends AdapterBase implements Investigator { private static final Logger s_logger = Logger.getLogger(AbstractInvestigatorImpl.class); - private String _name = null; @Inject private HostDao _hostDao = null; @Inject private AgentManager _agentMgr = null; @Inject private ResourceManager _resourceMgr = null; @@ -52,16 +52,10 @@ public abstract class AbstractInvestigatorImpl implements Investigator { @Override public boolean configure(String name, Map params) throws ConfigurationException { - _name = name; return true; } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { return true; diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java index 86662a3e2c3..29719105a15 100644 --- a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java +++ b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java @@ -20,7 +20,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.CheckVirtualMachineAnswer; @@ -33,7 +32,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine.State; -@Component @Local(value=Investigator.class) public class CheckOnAgentInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(CheckOnAgentInvestigator.class); diff --git a/server/src/com/cloud/ha/KVMFencer.java b/server/src/com/cloud/ha/KVMFencer.java index b4d58a123e4..9fcacd72321 100755 --- a/server/src/com/cloud/ha/KVMFencer.java +++ b/server/src/com/cloud/ha/KVMFencer.java @@ -25,7 +25,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.FenceAnswer; @@ -37,13 +36,12 @@ import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.resource.ResourceManager; +import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VMInstanceVO; -@Component @Local(value=FenceBuilder.class) -public class KVMFencer implements FenceBuilder { +public class KVMFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(KVMFencer.class); - String _name; @Inject HostDao _hostDao; @Inject AgentManager _agentMgr; @@ -52,15 +50,9 @@ public class KVMFencer implements FenceBuilder { public boolean configure(String name, Map params) throws ConfigurationException { // TODO Auto-generated method stub - _name = name; return true; } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { // TODO Auto-generated method stub diff --git a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java index 1d9b265b45a..81bdc734de1 100644 --- a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java +++ b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java @@ -24,7 +24,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.host.HostVO; import com.cloud.host.Status; @@ -35,7 +34,6 @@ import com.cloud.vm.Nic; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; -@Component @Local(value={Investigator.class}) public class ManagementIPSystemVMInvestigator extends AbstractInvestigatorImpl { private static final Logger s_logger = Logger.getLogger(ManagementIPSystemVMInvestigator.class); diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/com/cloud/ha/UserVmDomRInvestigator.java index 8e54206cbb6..742dc57a2d2 100644 --- a/server/src/com/cloud/ha/UserVmDomRInvestigator.java +++ b/server/src/com/cloud/ha/UserVmDomRInvestigator.java @@ -25,7 +25,6 @@ import javax.inject.Inject; 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; @@ -43,7 +42,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.dao.UserVmDao; -@Component @Local(value={Investigator.class}) public class UserVmDomRInvestigator extends AbstractInvestigatorImpl { private static final Logger s_logger = Logger.getLogger(UserVmDomRInvestigator.class); diff --git a/server/src/com/cloud/ha/XenServerInvestigator.java b/server/src/com/cloud/ha/XenServerInvestigator.java index 9537340d7fa..6cbd22ff2da 100755 --- a/server/src/com/cloud/ha/XenServerInvestigator.java +++ b/server/src/com/cloud/ha/XenServerInvestigator.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckOnHostAnswer; @@ -36,7 +35,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VMInstanceVO; -@Component @Local(value=Investigator.class) public class XenServerInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(XenServerInvestigator.class); diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java index e3207d02514..662ee3e836b 100644 --- a/server/src/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/com/cloud/hypervisor/KVMGuru.java @@ -19,8 +19,6 @@ package com.cloud.hypervisor; import javax.ejb.Local; import javax.inject.Inject; -import org.springframework.stereotype.Component; - import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.GuestOSVO; @@ -28,7 +26,6 @@ import com.cloud.storage.dao.GuestOSDao; 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; diff --git a/server/src/com/cloud/hypervisor/guru/HypervGuru.java b/server/src/com/cloud/hypervisor/guru/HypervGuru.java index fbded66bd13..630080e21cb 100644 --- a/server/src/com/cloud/hypervisor/guru/HypervGuru.java +++ b/server/src/com/cloud/hypervisor/guru/HypervGuru.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import com.cloud.agent.api.Command; import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.host.dao.HostDetailsDao; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.HypervisorGuru; import com.cloud.hypervisor.HypervisorGuruBase; diff --git a/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java b/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java index 8fbca29895c..06658b7f3e2 100755 --- a/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java @@ -29,7 +29,6 @@ import javax.inject.Inject; 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; @@ -55,7 +54,6 @@ 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); diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 599222abba4..84bb4baaca4 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -28,7 +28,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -63,7 +62,6 @@ import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; import com.cloud.utils.ssh.SSHCmdHelper; -@Component @Local(value=Discoverer.class) public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { diff --git a/server/src/com/cloud/network/ExteralIpAddressAllocator.java b/server/src/com/cloud/network/ExteralIpAddressAllocator.java index eca5ff6eda9..2b78712b86f 100644 --- a/server/src/com/cloud/network/ExteralIpAddressAllocator.java +++ b/server/src/com/cloud/network/ExteralIpAddressAllocator.java @@ -29,16 +29,15 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.dao.VlanDao; import com.cloud.network.dao.IPAddressDao; +import com.cloud.utils.component.AdapterBase; import com.cloud.utils.exception.CloudRuntimeException; -@Component @Local(value=IpAddrAllocator.class) -public class ExteralIpAddressAllocator implements IpAddrAllocator{ +public class ExteralIpAddressAllocator extends AdapterBase implements IpAddrAllocator{ private static final Logger s_logger = Logger.getLogger(ExteralIpAddressAllocator.class); String _name; @Inject ConfigurationDao _configDao = null; diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java index 469a08b31d6..3132ffd4b83 100755 --- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java @@ -23,7 +23,6 @@ import javax.inject.Inject; 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; @@ -55,7 +54,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index a9ee06912f4..f49895714bd 100755 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -20,7 +20,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; @@ -56,7 +55,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java index 513d2cd7c68..6c305ec8a6a 100755 --- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.ZoneConfig; import com.cloud.dc.DataCenter; @@ -57,7 +56,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java index 31bbd9c6cbe..8188eb97df2 100644 --- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java @@ -22,10 +22,8 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.Config; -import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.dao.DataCenterDao; @@ -44,9 +42,7 @@ import com.cloud.network.NetworkVO; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; -import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.dao.NetworkDao; -import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.rules.PortForwardingRuleVO; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.offering.NetworkOffering; @@ -63,7 +59,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java index 65bdcebd98c..fd706897e3c 100755 --- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java @@ -22,7 +22,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.Pod; import com.cloud.dc.dao.DataCenterDao; @@ -50,7 +49,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java index 73b75dfa6b6..e958f74405b 100644 --- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java @@ -20,7 +20,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.DataCenter; @@ -55,7 +54,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index ea9f275d0b4..52e1662311e 100755 --- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java @@ -20,7 +20,6 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan.VlanType; @@ -56,7 +55,6 @@ 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); diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java index b55246a27ae..092ae7c816b 100755 --- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java +++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java @@ -20,13 +20,11 @@ import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.dc.Pod; import com.cloud.dc.StorageNetworkIpAddressVO; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; -import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.network.Network; @@ -40,8 +38,6 @@ import com.cloud.network.StorageNetworkManager; import com.cloud.network.dao.NetworkDao; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; -import com.cloud.utils.component.AdapterBase; -import com.cloud.utils.net.Ip4Address; import com.cloud.utils.net.NetUtils; import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; @@ -49,7 +45,6 @@ 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); diff --git a/server/src/com/cloud/resource/DiscovererBase.java b/server/src/com/cloud/resource/DiscovererBase.java index 8bf599bdf06..3d45799998a 100644 --- a/server/src/com/cloud/resource/DiscovererBase.java +++ b/server/src/com/cloud/resource/DiscovererBase.java @@ -35,10 +35,10 @@ import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.network.NetworkManager; +import com.cloud.utils.component.AdapterBase; import com.cloud.utils.net.UrlUtil; -public abstract class DiscovererBase implements Discoverer { - protected String _name; +public abstract class DiscovererBase extends AdapterBase implements Discoverer { protected Map _params; private static final Logger s_logger = Logger.getLogger(DiscovererBase.class); @Inject protected ClusterDao _clusterDao; @@ -49,7 +49,6 @@ public abstract class DiscovererBase implements Discoverer { @Override public boolean configure(String name, Map params) throws ConfigurationException { _params = _configDao.getConfiguration(params); - _name = name; return true; } @@ -68,11 +67,6 @@ public abstract class DiscovererBase implements Discoverer { _params.putAll(params); } - @Override - public String getName() { - return _name; - } - @Override public boolean start() { return true; diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java index 25fa802a957..347b9c0b362 100644 --- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java +++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java @@ -23,13 +23,15 @@ import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; +import com.cloud.utils.component.AdapterBase; + /** * Use this UserAuthenticator if users are already authenticated outside * */ @Component @Local(value={UserAuthenticator.class}) -public abstract class DefaultUserAuthenticator implements UserAuthenticator { +public abstract class DefaultUserAuthenticator extends AdapterBase implements UserAuthenticator { private String _name = null; @Override diff --git a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java index bd9dab8d442..13a010729e0 100644 --- a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java @@ -28,7 +28,6 @@ import javax.inject.Inject; 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; @@ -45,7 +44,6 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Component @Local(value=StoragePoolAllocator.class) public class FirstFitStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(FirstFitStoragePoolAllocator.class); diff --git a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java index 05c23a8e7ed..b6b8e8e98ff 100644 --- a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java @@ -26,7 +26,6 @@ import javax.inject.Inject; 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; @@ -62,7 +61,6 @@ 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); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java index aa37d7f4065..12db88ccefd 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java @@ -31,7 +31,6 @@ import javax.inject.Inject; 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; @@ -58,7 +57,6 @@ 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); diff --git a/utils/src/com/cloud/utils/component/AdapterBase.java b/utils/src/com/cloud/utils/component/AdapterBase.java index a735d85fd19..1640ee1c4fb 100644 --- a/utils/src/com/cloud/utils/component/AdapterBase.java +++ b/utils/src/com/cloud/utils/component/AdapterBase.java @@ -33,6 +33,9 @@ public class AdapterBase implements Adapter { @Override public String getName() { + if(_name == null) + return this.getClass().getSimpleName(); + return _name; }