From aab02e27436dde87d66013f10c19bf0a9e54e11c Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 1 Nov 2012 10:36:33 -0700 Subject: [PATCH] Add Spring annotation to major components --- .../bridge/persist/dao/BucketPolicyDaoImpl.java | 3 +++ .../persist/dao/CloudStackAccountDaoImpl.java | 3 +++ .../persist/dao/CloudStackConfigurationDaoImpl.java | 3 ++- .../persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 ++ .../com/cloud/bridge/persist/dao/MHostDaoImpl.java | 3 +++ .../cloud/bridge/persist/dao/MHostMountDaoImpl.java | 3 +++ .../bridge/persist/dao/MultiPartPartsDaoImpl.java | 3 +++ .../bridge/persist/dao/MultiPartUploadsDaoImpl.java | 3 +++ .../bridge/persist/dao/MultipartMetaDaoImpl.java | 3 +++ .../cloud/bridge/persist/dao/OfferingDaoImpl.java | 2 ++ .../com/cloud/bridge/persist/dao/SAclDaoImpl.java | 3 +++ .../cloud/bridge/persist/dao/SBucketDaoImpl.java | 3 +++ .../com/cloud/bridge/persist/dao/SHostDaoImpl.java | 3 +++ .../com/cloud/bridge/persist/dao/SMetaDaoImpl.java | 3 +++ .../cloud/bridge/persist/dao/SObjectDaoImpl.java | 3 +++ .../bridge/persist/dao/SObjectItemDaoImpl.java | 3 +++ .../bridge/persist/dao/UserCredentialsDaoImpl.java | 2 ++ core/src/com/cloud/event/dao/EventDaoImpl.java | 2 ++ core/src/com/cloud/event/dao/UsageEventDaoImpl.java | 2 ++ .../cloud/deploy/UserConcentratedPodPlanner.java | 2 ++ .../src/com/cloud/deploy/UserDispersingPlanner.java | 2 ++ .../src/com/cloud/netapp/NetappManagerImpl.java | 2 ++ .../netapp/src/com/cloud/netapp/dao/LunDaoImpl.java | 2 ++ .../src/com/cloud/netapp/dao/PoolDaoImpl.java | 2 ++ .../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 2 ++ .../manager/allocator/impl/RandomAllocator.java | 1 + .../src/com/cloud/ovm/hypervisor/OvmDiscoverer.java | 2 ++ .../ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java | 2 ++ .../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 3 +++ .../vmware/src/com/cloud/ha/VmwareFencer.java | 3 +++ .../vmware/src/com/cloud/ha/VmwareInvestigator.java | 3 +++ .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 2 ++ .../hypervisor/vmware/VmwareServerDiscoverer.java | 2 ++ .../vmware/manager/VmwareManagerImpl.java | 2 ++ .../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 ++ .../cloud/network/element/CiscoNexusVSMElement.java | 2 ++ .../xen/src/com/cloud/ha/XenServerFencer.java | 2 ++ .../xen/src/com/cloud/hypervisor/XenServerGuru.java | 3 +++ .../xen/discoverer/XcpServerDiscoverer.java | 2 ++ .../network/element/ElasticLoadBalancerElement.java | 3 ++- .../network/lb/ElasticLoadBalancerManagerImpl.java | 2 ++ .../cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java | 3 +++ .../element/F5ExternalLoadBalancerElement.java | 2 ++ .../element/JuniperSRXExternalFirewallElement.java | 2 ++ .../network/element/MidokuraMidonetElement.java | 2 ++ .../guru/MidokuraMidonetGuestNetworkGuru.java | 2 ++ .../com/cloud/network/dao/NetScalerPodDaoImpl.java | 3 +++ .../com/cloud/network/element/NetscalerElement.java | 2 ++ .../src/com/cloud/network/dao/NiciraNvpDaoImpl.java | 3 +++ .../network/dao/NiciraNvpNicMappingDaoImpl.java | 3 +++ .../com/cloud/network/element/NiciraNvpElement.java | 2 ++ .../src/com/cloud/network/element/OvsElement.java | 3 +++ .../com/cloud/network/guru/OvsGuestNetworkGuru.java | 2 ++ .../com/cloud/network/ovs/OvsTunnelManagerImpl.java | 2 ++ .../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java | 3 +++ .../network/ovs/dao/OvsTunnelNetworkDaoImpl.java | 3 +++ .../allocator/RandomStoragePoolAllocator.java | 2 ++ .../cloud/server/auth/LDAPUserAuthenticator.java | 2 ++ .../com/cloud/server/auth/MD5UserAuthenticator.java | 2 ++ .../server/auth/PlainTextUserAuthenticator.java | 2 ++ server/src/com/cloud/acl/DomainChecker.java | 3 +++ .../com/cloud/agent/manager/AgentManagerImpl.java | 2 ++ .../agent/manager/ClusteredAgentManagerImpl.java | 2 ++ .../manager/allocator/impl/FirstFitAllocator.java | 2 ++ .../allocator/impl/FirstFitRoutingAllocator.java | 3 +++ .../allocator/impl/RecreateHostAllocator.java | 2 ++ .../manager/allocator/impl/TestingAllocator.java | 3 +++ .../allocator/impl/UserConcentratedAllocator.java | 2 ++ .../manager/authn/impl/BasicAgentAuthManager.java | 2 ++ server/src/com/cloud/alert/AlertManagerImpl.java | 2 ++ server/src/com/cloud/alert/ClusterAlertAdapter.java | 2 ++ .../com/cloud/alert/ConsoleProxyAlertAdapter.java | 2 ++ .../cloud/alert/SecondaryStorageVmAlertAdapter.java | 2 ++ server/src/com/cloud/alert/dao/AlertDaoImpl.java | 3 +++ .../cloud/async/AsyncJobExecutorContextImpl.java | 3 +++ server/src/com/cloud/async/AsyncJobManagerImpl.java | 2 ++ .../src/com/cloud/async/SyncQueueManagerImpl.java | 2 ++ server/src/com/cloud/async/dao/AsyncJobDaoImpl.java | 2 ++ .../src/com/cloud/async/dao/SyncQueueDaoImpl.java | 2 ++ .../com/cloud/async/dao/SyncQueueItemDaoImpl.java | 6 +++++- .../com/cloud/baremetal/BareMetalDiscoverer.java | 2 ++ server/src/com/cloud/baremetal/BareMetalGuru.java | 3 +++ .../cloud/baremetal/BareMetalPingServiceImpl.java | 2 ++ .../com/cloud/baremetal/BareMetalResourceBase.java | 2 ++ .../cloud/baremetal/ExternalDhcpManagerImpl.java | 2 ++ .../com/cloud/baremetal/PxeServerManagerImpl.java | 3 +++ .../src/com/cloud/capacity/CapacityManagerImpl.java | 2 ++ .../src/com/cloud/capacity/dao/CapacityDaoImpl.java | 2 ++ .../cloud/certificate/dao/CertificateDaoImpl.java | 2 ++ .../com/cloud/cluster/CheckPointManagerImpl.java | 2 ++ .../com/cloud/cluster/ClusterFenceManagerImpl.java | 2 ++ .../src/com/cloud/cluster/ClusterManagerImpl.java | 2 ++ .../cloud/cluster/ClusterServiceServletAdapter.java | 2 ++ .../com/cloud/cluster/DummyClusterManagerImpl.java | 2 ++ .../src/com/cloud/cluster/ManagementServerNode.java | 3 +++ .../ClusterBasedAgentLoadBalancerPlanner.java | 3 ++- .../cluster/agentlb/dao/HostTransferMapDaoImpl.java | 2 ++ .../cluster/dao/ManagementServerHostDaoImpl.java | 2 ++ .../dao/ManagementServerHostPeerDaoImpl.java | 2 ++ .../src/com/cloud/cluster/dao/StackMaidDaoImpl.java | 2 ++ .../configuration/ConfigurationManagerImpl.java | 2 ++ .../configuration/dao/ConfigurationDaoImpl.java | 2 ++ .../configuration/dao/ResourceCountDaoImpl.java | 3 +++ .../configuration/dao/ResourceLimitDaoImpl.java | 3 +++ .../consoleproxy/AgentBasedConsoleProxyManager.java | 2 ++ .../AgentBasedStandaloneConsoleProxyManager.java | 2 ++ .../consoleproxy/ConsoleProxyBalanceAllocator.java | 3 +++ .../cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 ++ .../consoleproxy/StaticConsoleProxyManager.java | 3 +++ server/src/com/cloud/dao/EntityManagerImpl.java | 3 +++ server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 3 +++ .../src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 3 +++ server/src/com/cloud/dc/dao/ClusterDaoImpl.java | 3 +++ .../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 3 +++ server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 2 ++ .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 2 ++ .../dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java | 2 ++ .../src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 3 +++ server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 3 +++ server/src/com/cloud/dc/dao/HostPodDaoImpl.java | 2 ++ server/src/com/cloud/dc/dao/PodVlanDaoImpl.java | 3 +++ server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java | 3 +++ .../dc/dao/StorageNetworkIpAddressDaoImpl.java | 3 +++ .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java | 3 +++ server/src/com/cloud/dc/dao/VlanDaoImpl.java | 3 +++ server/src/com/cloud/deploy/BareMetalPlanner.java | 2 ++ server/src/com/cloud/deploy/FirstFitPlanner.java | 2 ++ server/src/com/cloud/domain/dao/DomainDaoImpl.java | 2 ++ .../src/com/cloud/ha/CheckOnAgentInvestigator.java | 2 ++ .../cloud/ha/HighAvailabilityManagerExtImpl.java | 3 +++ .../com/cloud/ha/HighAvailabilityManagerImpl.java | 2 ++ server/src/com/cloud/ha/KVMFencer.java | 2 ++ .../cloud/ha/ManagementIPSystemVMInvestigator.java | 2 ++ server/src/com/cloud/ha/RecreatableFencer.java | 2 ++ server/src/com/cloud/ha/UserVmDomRInvestigator.java | 2 ++ server/src/com/cloud/ha/XenServerInvestigator.java | 2 ++ .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 2 ++ server/src/com/cloud/host/dao/HostDaoImpl.java | 2 ++ .../src/com/cloud/host/dao/HostDetailsDaoImpl.java | 3 +++ server/src/com/cloud/host/dao/HostTagsDaoImpl.java | 4 +++- .../hypervisor/CloudZonesStartupProcessor.java | 2 ++ .../cloud/hypervisor/HypervisorGuruManagerImpl.java | 2 ++ server/src/com/cloud/hypervisor/KVMGuru.java | 3 +++ .../dao/HypervisorCapabilitiesDaoImpl.java | 2 ++ .../hypervisor/hyperv/HypervServerDiscoverer.java | 2 ++ .../kvm/discoverer/KvmServerDiscoverer.java | 2 ++ server/src/com/cloud/keystore/KeystoreDaoImpl.java | 3 +++ .../src/com/cloud/keystore/KeystoreManagerImpl.java | 2 ++ server/src/com/cloud/maint/UpgradeManagerImpl.java | 2 ++ .../com/cloud/maint/dao/AgentUpgradeDaoImpl.java | 3 +++ .../com/cloud/migration/DiskOffering20DaoImpl.java | 3 +++ .../com/cloud/migration/DiskOffering21DaoImpl.java | 3 +++ .../cloud/migration/ServiceOffering20DaoImpl.java | 3 +++ .../cloud/migration/ServiceOffering21DaoImpl.java | 3 +++ .../cloud/network/ExteralIpAddressAllocator.java | 2 ++ .../ExternalLoadBalancerUsageManagerImpl.java | 2 ++ .../network/ExternalNetworkDeviceManagerImpl.java | 2 ++ .../src/com/cloud/network/NetworkManagerImpl.java | 2 ++ .../com/cloud/network/NetworkUsageManagerImpl.java | 2 ++ .../cloud/network/StorageNetworkManagerImpl.java | 2 ++ .../network/dao/ExternalFirewallDeviceDaoImpl.java | 4 ++++ .../dao/ExternalLoadBalancerDeviceDaoImpl.java | 4 ++++ .../network/dao/FirewallRulesCidrsDaoImpl.java | 3 ++- .../com/cloud/network/dao/FirewallRulesDaoImpl.java | 3 +++ .../src/com/cloud/network/dao/IPAddressDaoImpl.java | 2 ++ .../dao/InlineLoadBalancerNicMapDaoImpl.java | 3 +++ .../network/dao/LBStickinessPolicyDaoImpl.java | 5 +++-- .../com/cloud/network/dao/LoadBalancerDaoImpl.java | 2 ++ .../cloud/network/dao/LoadBalancerVMMapDaoImpl.java | 3 +++ .../src/com/cloud/network/dao/NetworkDaoImpl.java | 3 +++ .../com/cloud/network/dao/NetworkDomainDaoImpl.java | 3 +++ .../network/dao/NetworkExternalFirewallDaoImpl.java | 3 +++ .../dao/NetworkExternalLoadBalancerDaoImpl.java | 3 +++ .../src/com/cloud/network/dao/NetworkOpDaoImpl.java | 4 +++- .../cloud/network/dao/NetworkRuleConfigDaoImpl.java | 3 +++ .../cloud/network/dao/NetworkServiceMapDaoImpl.java | 3 +++ .../cloud/network/dao/PhysicalNetworkDaoImpl.java | 3 +++ .../dao/PhysicalNetworkIsolationMethodDaoImpl.java | 4 +++- .../dao/PhysicalNetworkServiceProviderDaoImpl.java | 3 +++ .../network/dao/PhysicalNetworkTagDaoImpl.java | 4 +++- .../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 3 +++ .../com/cloud/network/dao/PortProfileDaoImpl.java | 2 ++ .../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 2 ++ .../com/cloud/network/dao/RouterNetworkDaoImpl.java | 4 +++- .../dao/Site2SiteCustomerGatewayDaoImpl.java | 2 ++ .../network/dao/Site2SiteVpnConnectionDaoImpl.java | 2 ++ .../network/dao/Site2SiteVpnGatewayDaoImpl.java | 2 ++ .../network/dao/VirtualRouterProviderDaoImpl.java | 3 +++ .../src/com/cloud/network/dao/VpnUserDaoImpl.java | 3 +++ .../com/cloud/network/element/BareMetalElement.java | 2 ++ .../network/element/CloudZonesNetworkElement.java | 2 ++ .../cloud/network/element/ExternalDhcpElement.java | 2 ++ .../cloud/network/element/SecurityGroupElement.java | 3 +++ .../cloud/network/element/VirtualRouterElement.java | 2 ++ .../network/element/VpcVirtualRouterElement.java | 3 +++ .../cloud/network/firewall/FirewallManagerImpl.java | 2 ++ .../com/cloud/network/guru/ControlNetworkGuru.java | 2 ++ .../com/cloud/network/guru/DirectNetworkGuru.java | 2 ++ .../network/guru/DirectPodBasedNetworkGuru.java | 2 ++ .../network/guru/ExternalGuestNetworkGuru.java | 2 ++ .../com/cloud/network/guru/GuestNetworkGuru.java | 2 ++ .../com/cloud/network/guru/PodBasedNetworkGuru.java | 2 ++ .../com/cloud/network/guru/PrivateNetworkGuru.java | 2 ++ .../com/cloud/network/guru/PublicNetworkGuru.java | 2 ++ .../com/cloud/network/guru/StorageNetworkGuru.java | 2 ++ .../network/lb/LoadBalancingRulesManagerImpl.java | 2 ++ .../router/VirtualNetworkApplianceManagerImpl.java | 2 ++ .../VpcVirtualNetworkApplianceManagerImpl.java | 2 ++ .../com/cloud/network/rules/RulesManagerImpl.java | 2 ++ .../rules/dao/PortForwardingRulesDaoImpl.java | 3 +++ .../network/security/SecurityGroupManagerImpl.java | 2 ++ .../network/security/SecurityGroupManagerImpl2.java | 3 +++ .../network/security/dao/SecurityGroupDaoImpl.java | 5 ++++- .../security/dao/SecurityGroupRuleDaoImpl.java | 3 +++ .../security/dao/SecurityGroupRulesDaoImpl.java | 3 +++ .../security/dao/SecurityGroupVMMapDaoImpl.java | 3 +++ .../security/dao/SecurityGroupWorkDaoImpl.java | 2 ++ .../network/security/dao/VmRulesetLogDaoImpl.java | 2 ++ .../cloud/network/vpc/NetworkACLManagerImpl.java | 2 ++ .../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 ++ .../com/cloud/network/vpc/dao/PrivateIpDaoImpl.java | 3 ++- .../cloud/network/vpc/dao/StaticRouteDaoImpl.java | 4 +++- .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 4 +++- .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 4 +++- .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 4 +++- .../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 4 +++- .../network/vpn/RemoteAccessVpnManagerImpl.java | 2 ++ .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 2 ++ .../cloud/offerings/dao/NetworkOfferingDaoImpl.java | 3 +++ .../dao/NetworkOfferingServiceMapDaoImpl.java | 3 +++ .../src/com/cloud/projects/ProjectManagerImpl.java | 2 ++ .../cloud/projects/dao/ProjectAccountDaoImpl.java | 2 ++ .../src/com/cloud/projects/dao/ProjectDaoImpl.java | 2 ++ .../projects/dao/ProjectInvitationDaoImpl.java | 2 ++ .../src/com/cloud/resource/DummyHostDiscoverer.java | 2 ++ .../src/com/cloud/resource/ResourceManagerImpl.java | 2 ++ .../resourcelimit/ResourceLimitManagerImpl.java | 2 ++ .../com/cloud/secstorage/CommandExecLogDaoImpl.java | 3 +++ .../PremiumSecondaryStorageManagerImpl.java | 2 ++ .../cloud/server/auth/DefaultUserAuthenticator.java | 3 +++ .../cloud/service/dao/ServiceOfferingDaoImpl.java | 2 ++ server/src/com/cloud/storage/OCFS2ManagerImpl.java | 2 ++ .../src/com/cloud/storage/StorageManagerImpl.java | 2 ++ .../allocator/FirstFitStoragePoolAllocator.java | 2 ++ .../GarbageCollectingStoragePoolAllocator.java | 2 ++ .../allocator/LocalStoragePoolAllocator.java | 2 ++ .../storage/allocator/UseLocalForRootAllocator.java | 3 +++ .../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 2 ++ .../cloud/storage/dao/GuestOSCategoryDaoImpl.java | 3 +++ .../src/com/cloud/storage/dao/GuestOSDaoImpl.java | 3 +++ .../cloud/storage/dao/LaunchPermissionDaoImpl.java | 2 ++ .../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 2 ++ .../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 3 +++ .../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 4 +++- .../com/cloud/storage/dao/StoragePoolDaoImpl.java | 3 +++ .../storage/dao/StoragePoolDetailsDaoImpl.java | 3 +++ .../cloud/storage/dao/StoragePoolHostDaoImpl.java | 2 ++ .../cloud/storage/dao/StoragePoolWorkDaoImpl.java | 3 +++ server/src/com/cloud/storage/dao/SwiftDaoImpl.java | 3 ++- server/src/com/cloud/storage/dao/UploadDaoImpl.java | 2 ++ .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 ++ .../cloud/storage/dao/VMTemplateDetailsDaoImpl.java | 3 +++ .../cloud/storage/dao/VMTemplateHostDaoImpl.java | 2 ++ .../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 2 ++ .../cloud/storage/dao/VMTemplateSwiftDaoImpl.java | 2 ++ .../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 2 ++ server/src/com/cloud/storage/dao/VolumeDaoImpl.java | 2 ++ .../com/cloud/storage/dao/VolumeHostDaoImpl.java | 5 ++++- .../cloud/storage/download/DownloadMonitorImpl.java | 2 ++ .../secondary/SecondaryStorageDiscoverer.java | 2 ++ .../secondary/SecondaryStorageManagerImpl.java | 2 ++ .../SecondaryStorageVmDefaultAllocator.java | 3 +++ .../cloud/storage/snapshot/SnapshotManagerImpl.java | 2 ++ .../storage/snapshot/SnapshotSchedulerImpl.java | 2 ++ .../com/cloud/storage/swift/SwiftManagerImpl.java | 2 ++ .../com/cloud/storage/upload/UploadMonitorImpl.java | 2 ++ .../com/cloud/tags/TaggedResourceManagerImpl.java | 2 ++ .../src/com/cloud/tags/dao/ResourceTagsDaoImpl.java | 5 ++++- .../com/cloud/upgrade/DatabaseIntegrityChecker.java | 2 ++ .../upgrade/PremiumDatabaseUpgradeChecker.java | 3 +++ .../src/com/cloud/upgrade/dao/VersionDaoImpl.java | 2 ++ .../dao/ExternalPublicIpStatisticsDaoImpl.java | 3 +++ server/src/com/cloud/usage/dao/UsageDaoImpl.java | 2 ++ .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 2 ++ server/src/com/cloud/usage/dao/UsageJobDaoImpl.java | 2 ++ .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 2 ++ .../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 2 ++ .../usage/dao/UsageNetworkOfferingDaoImpl.java | 2 ++ .../usage/dao/UsagePortForwardingRuleDaoImpl.java | 2 ++ .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 2 ++ .../com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 ++ .../com/cloud/usage/dao/UsageVMInstanceDaoImpl.java | 2 ++ .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 2 ++ .../src/com/cloud/usage/dao/UsageVolumeDaoImpl.java | 2 ++ server/src/com/cloud/user/AccountManagerImpl.java | 2 ++ server/src/com/cloud/user/DomainManagerImpl.java | 2 ++ server/src/com/cloud/user/dao/AccountDaoImpl.java | 2 ++ .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 3 +++ .../src/com/cloud/user/dao/UserAccountDaoImpl.java | 3 +++ server/src/com/cloud/user/dao/UserDaoImpl.java | 3 +++ .../com/cloud/user/dao/UserStatisticsDaoImpl.java | 2 ++ .../src/com/cloud/user/dao/UserStatsLogDaoImpl.java | 3 +++ .../com/cloud/uuididentity/IdentityServiceImpl.java | 3 +++ .../com/cloud/uuididentity/dao/IdentityDaoImpl.java | 2 ++ .../vm/ClusteredVirtualMachineManagerImpl.java | 3 +++ server/src/com/cloud/vm/ItWorkDaoImpl.java | 3 +++ server/src/com/cloud/vm/UserVmManagerImpl.java | 2 ++ .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 ++ .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 2 ++ .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 3 +++ .../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java | 3 +++ .../com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java | 3 +++ server/src/com/cloud/vm/dao/NicDaoImpl.java | 3 +++ .../vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java | 2 ++ .../com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 2 ++ server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 2 ++ server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 3 +++ .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 3 +++ server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 13 ++++++++++++- 319 files changed, 778 insertions(+), 24 deletions(-) diff --git a/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java index 41bf3117d0f..ce230c3d57a 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java @@ -20,6 +20,8 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.BucketPolicyVO; import com.cloud.utils.component.ComponentLocator; 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.Transaction; +@Component @Local(value={BucketPolicyDao.class}) public class BucketPolicyDaoImpl extends GenericDaoBase implements BucketPolicyDao{ public static final Logger logger = Logger.getLogger(BucketPolicyDaoImpl.class); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java index bca12f6b3e8..8fbc7c8e3af 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.CloudStackAccountVO; 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={CloudStackAccountDao.class}) public class CloudStackAccountDaoImpl extends GenericDaoBase implements CloudStackAccountDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java index 63330428159..511cfa73946 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java @@ -24,6 +24,7 @@ import java.sql.SQLException; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.bridge.model.CloudStackConfigurationVO; import com.cloud.utils.component.ComponentLocator; @@ -33,7 +34,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; - +@Component @Local(value={CloudStackConfigurationDao.class}) public class CloudStackConfigurationDaoImpl extends GenericDaoBase implements CloudStackConfigurationDao { private static final Logger s_logger = Logger.getLogger(CloudStackConfigurationDaoImpl.class); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java index dca38912aa5..8cca13eb1df 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java @@ -19,6 +19,7 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.bridge.model.CloudStackServiceOfferingVO; import com.cloud.bridge.model.SHostVO; @@ -29,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={CloudStackSvcOfferingDao.class}) public class CloudStackSvcOfferingDaoImpl extends GenericDaoBase implements CloudStackSvcOfferingDao { public static final Logger logger = Logger.getLogger(CloudStackSvcOfferingDaoImpl.class); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java index aff6f810068..67abf816f32 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java @@ -17,6 +17,8 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.MHostVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @@ -24,6 +26,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={MHostDao.class}) public class MHostDaoImpl extends GenericDaoBase implements MHostDao{ final SearchBuilder NameSearch= createSearchBuilder(); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java index 4450da844a7..8b99f487911 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.MHostMountVO; 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={MHostMountDao.class}) public class MHostMountDaoImpl extends GenericDaoBase implements MHostMountDao { final SearchBuilder SearchByMHostID = createSearchBuilder(); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java index 23bee42acc2..6f314951697 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.MultiPartPartsVO; import com.cloud.utils.db.Filter; 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.Transaction; +@Component @Local(value={MultiPartPartsDao.class}) public class MultiPartPartsDaoImpl extends GenericDaoBase implements MultiPartPartsDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java index ce2928db1c4..0f76e80a952 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.MultiPartPartsVO; import com.cloud.bridge.model.MultiPartUploadsVO; import com.cloud.bridge.model.SBucketVO; @@ -32,6 +34,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={MultiPartUploadsDao.class}) public class MultiPartUploadsDaoImpl extends GenericDaoBase implements MultiPartUploadsDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java index 2bcd6260920..7ab93599d22 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java @@ -20,12 +20,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.MultipartMetaVO; 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={MultipartMetaDao.class}) public class MultipartMetaDaoImpl extends GenericDaoBase implements MultipartMetaDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java index 5a9a6250665..cce0f838f88 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java @@ -22,6 +22,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.bridge.model.OfferingBundleVO; import com.cloud.utils.db.GenericDaoBase; @@ -29,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={OfferingDao.class}) public class OfferingDaoImpl extends GenericDaoBase implements OfferingDao { public static final Logger logger = Logger.getLogger(OfferingDaoImpl.class); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java index c73c1db02b1..d88660e05c9 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.SAcl; import com.cloud.bridge.model.SAclVO; import com.cloud.bridge.service.core.s3.S3AccessControlList; @@ -31,6 +33,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={SAclDao.class}) public class SAclDaoImpl extends GenericDaoBase implements SAclDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java index 53e9e07fb1d..817c682a946 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.SBucket; import com.cloud.bridge.model.SBucketVO; import com.cloud.utils.db.Filter; @@ -28,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={SBucketDao.class}) public class SBucketDaoImpl extends GenericDaoBase implements SBucketDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java index efe9500d9b9..5eadd0661c1 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.bridge.persist.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.SHostVO; 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={SHostDao.class}) public class SHostDaoImpl extends GenericDaoBase implements SHostDao { public SHostDaoImpl() {} diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java index e0555ecd42f..8fdc9493d82 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.SMetaVO; import com.cloud.bridge.service.core.s3.S3MetaDataEntry; 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.Transaction; +@Component @Local(value={SMetaDao.class}) public class SMetaDaoImpl extends GenericDaoBase implements SMetaDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java index b588877f06c..3e6815279bd 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java @@ -23,6 +23,8 @@ import java.util.Set; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.SBucket; import com.cloud.bridge.model.SBucketVO; import com.cloud.bridge.model.SObjectItemVO; @@ -35,6 +37,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={SObjectDao.class}) public class SObjectDaoImpl extends GenericDaoBase implements SObjectDao { protected final SObjectItemDao itemDao = ComponentLocator.inject(SObjectItemDaoImpl.class); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java index ec632bbd244..57140c49072 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java @@ -20,12 +20,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.bridge.model.SObjectItemVO; 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={SObjectItemDao.class}) public class SObjectItemDaoImpl extends GenericDaoBase implements SObjectItemDao { diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java index c19c757355b..684b00b920f 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java @@ -21,6 +21,7 @@ import java.sql.*; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.bridge.model.UserCredentialsVO; import com.cloud.utils.db.DB; @@ -29,6 +30,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UserCredentialsDao.class}) public class UserCredentialsDaoImpl extends GenericDaoBase implements UserCredentialsDao { public static final Logger logger = Logger.getLogger(UserCredentialsDaoImpl.class); diff --git a/core/src/com/cloud/event/dao/EventDaoImpl.java b/core/src/com/cloud/event/dao/EventDaoImpl.java index abeefbe4ffd..44fbb030dcc 100644 --- a/core/src/com/cloud/event/dao/EventDaoImpl.java +++ b/core/src/com/cloud/event/dao/EventDaoImpl.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.event.Event.State; import com.cloud.event.EventVO; @@ -30,6 +31,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={EventDao.class}) public class EventDaoImpl extends GenericDaoBase implements EventDao { public static final Logger s_logger = Logger.getLogger(EventDaoImpl.class.getName()); diff --git a/core/src/com/cloud/event/dao/UsageEventDaoImpl.java b/core/src/com/cloud/event/dao/UsageEventDaoImpl.java index ea93d53e04b..dafc8d4d5ec 100644 --- a/core/src/com/cloud/event/dao/UsageEventDaoImpl.java +++ b/core/src/com/cloud/event/dao/UsageEventDaoImpl.java @@ -25,6 +25,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.dc.Vlan; import com.cloud.event.EventTypes; @@ -38,6 +39,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageEventDao.class}) public class UsageEventDaoImpl extends GenericDaoBase implements UsageEventDao { public static final Logger s_logger = Logger.getLogger(UsageEventDaoImpl.class.getName()); 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 2ab98566e0a..9e2d08a5b62 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,12 +23,14 @@ 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 2db2051389d..0f940031073 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,6 +27,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.hypervisor.Hypervisor.HypervisorType; @@ -35,6 +36,7 @@ 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/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java index 7dcb9d3d032..253e3719164 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java @@ -37,6 +37,7 @@ import netapp.manage.NaProtocolException; import netapp.manage.NaServer; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; @@ -49,6 +50,7 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = { NetappManager.class }) public class NetappManagerImpl implements NetappManager { diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java index 9cc67b7e894..0218c99286d 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.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.netapp.LunVO; import com.cloud.netapp.NetappVolumeVO; @@ -30,6 +31,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={LunDao.class}) public class LunDaoImpl extends GenericDaoBase implements LunDao { private static final Logger s_logger = Logger.getLogger(PoolDaoImpl.class); diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java index 3e23644840d..a3383c23527 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.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.netapp.PoolVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={PoolDao.class}) public class PoolDaoImpl extends GenericDaoBase implements PoolDao { private static final Logger s_logger = Logger.getLogger(PoolDaoImpl.class); diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java index 4a834294b6f..a53df8a9bce 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.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.netapp.NetappVolumeVO; import com.cloud.utils.db.Filter; @@ -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={VolumeDao.class}) public class VolumeDaoImpl extends GenericDaoBase implements VolumeDao { private static final Logger s_logger = Logger.getLogger(VolumeDaoImpl.class); diff --git a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java index 0887ee97969..75a8ff7d3d4 100755 --- a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java +++ b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java @@ -38,6 +38,7 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=HostAllocator.class) public class RandomAllocator implements HostAllocator { private static final Logger s_logger = Logger.getLogger(RandomAllocator.class); 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 cd15d8fbd63..4ad3663e6d9 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java @@ -29,6 +29,7 @@ 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; @@ -53,6 +54,7 @@ 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 cceb7fe969b..165bdec704e 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.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.api.FenceAnswer; @@ -38,6 +39,7 @@ import com.cloud.utils.component.Inject; import com.cloud.vm.VMInstanceVO; import com.cloud.resource.ResourceManager; +@Component @Local(value=FenceBuilder.class) public class OvmFencer implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(OvmFencer.class); 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 20221c3d335..eb99f6a1152 100755 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java @@ -18,6 +18,8 @@ package com.cloud.ovm.hypervisor; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.HypervisorGuru; import com.cloud.hypervisor.HypervisorGuruBase; @@ -28,6 +30,7 @@ import com.cloud.utils.component.Inject; 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/vmware/src/com/cloud/ha/VmwareFencer.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java index c732b94f707..b7627142e99 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java @@ -21,9 +21,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.host.HostVO; import com.cloud.vm.VMInstanceVO; +@Component @Local(value=FenceBuilder.class) public class VmwareFencer implements FenceBuilder { String _name; diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java index a7e67e1bbe1..2f639485d1e 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java +++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java @@ -18,12 +18,15 @@ package com.cloud.ha; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VMInstanceVO; +@Component @Local(value=Investigator.class) public class VmwareInvestigator extends AdapterBase implements Investigator { protected VmwareInvestigator() { diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index 546df5f2389..a0765d84993 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -26,6 +26,7 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.api.BackupSnapshotCommand; import com.cloud.agent.api.Command; @@ -71,6 +72,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VmDetailConstants; +@Component @Local(value=HypervisorGuru.class) public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { private static final Logger s_logger = Logger.getLogger(VMwareGuru.class); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index a75640bedfe..6026485e8c9 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.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.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; @@ -69,6 +70,7 @@ import com.cloud.utils.component.Inject; import com.vmware.vim25.ClusterDasConfigInfo; import com.vmware.vim25.ManagedObjectReference; +@Component @Local(value=Discoverer.class) public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(VmwareServerDiscoverer.class); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 64ded51b453..5549f14f5c0 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -35,6 +35,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; @@ -98,6 +99,7 @@ import com.vmware.apputils.vim25.ServiceUtil; import com.vmware.vim25.HostConnectSpec; import com.vmware.vim25.ManagedObjectReference; +@Component @Local(value = {VmwareManager.class}) public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Listener, Manager { private static final Logger s_logger = Logger.getLogger(VmwareManagerImpl.class); diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java index 7d8c5abfc07..cc25573dd2d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java @@ -20,6 +20,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.network.CiscoNexusVSMDeviceVO; import com.cloud.utils.db.DB; @@ -28,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=CiscoNexusVSMDeviceDao.class) @DB(txn=false) public class CiscoNexusVSMDeviceDaoImpl extends GenericDaoBase implements CiscoNexusVSMDeviceDao { protected static final Logger s_logger = Logger.getLogger(CiscoNexusVSMDeviceDaoImpl.class); diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java index 80c8ecfe9bb..990118f698d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.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.DeleteCiscoNexusVSMCmd; import com.cloud.api.commands.EnableCiscoNexusVSMCmd; @@ -59,6 +60,7 @@ import com.cloud.exception.ResourceInUseException; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.server.ManagementService; +@Component @Local(value = NetworkElement.class) public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl implements CiscoNexusVSMElementService, NetworkElement, Manager { diff --git a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java index d810c583b71..fffada68fbf 100755 --- a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java +++ b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.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.api.Answer; @@ -38,6 +39,7 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.Inject; import com.cloud.vm.VMInstanceVO; +@Component @Local(value=FenceBuilder.class) public class XenServerFencer implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(XenServerFencer.class); diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java index 585a18ce18f..a6b86aa7536 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.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; @@ -29,6 +31,7 @@ import com.cloud.utils.component.Inject; 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 9faceaae3bd..d047529f135 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 @@ -32,6 +32,7 @@ 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; @@ -97,6 +98,7 @@ 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/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java index 8490534f613..e1f7c95b355 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; @@ -52,7 +53,7 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; - +@Component @Local(value=NetworkElement.class) public class ElasticLoadBalancerElement extends AdapterBase implements LoadBalancingServiceProvider, IpDeployer { private static final Logger s_logger = Logger.getLogger(ElasticLoadBalancerElement.class); diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index 1cd830c9f4e..cc59b90806c 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -33,6 +33,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; @@ -136,6 +137,7 @@ import com.cloud.vm.VirtualMachineProfile.Param; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; +@Component @Local(value = { ElasticLoadBalancerManager.class }) public class ElasticLoadBalancerManagerImpl implements ElasticLoadBalancerManager, Manager, VirtualMachineGuru { diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java index 08c1efbd563..7913c979667 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.ElasticLbVmMapVO; import com.cloud.network.LoadBalancerVO; import com.cloud.network.dao.LoadBalancerDao; @@ -35,6 +37,7 @@ import com.cloud.vm.DomainRouterVO; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.DomainRouterDaoImpl; +@Component @Local(value={ElasticLbVmMapDao.class}) public class ElasticLbVmMapDaoImpl extends GenericDaoBase implements ElasticLbVmMapDao { protected final DomainRouterDao _routerDao = ComponentLocator.inject(DomainRouterDaoImpl.class); diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index 13967e3bcba..9c512964a3f 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.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.AddExternalLoadBalancerCmd; import com.cloud.api.commands.AddF5LoadBalancerCmd; @@ -88,6 +89,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.google.gson.Gson; +@Component @Local(value = NetworkElement.class) public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, IpDeployer, F5ExternalLoadBalancerElementService, ExternalLoadBalancerDeviceManager { diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java index cd4a0749a35..4e110076c7f 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.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.AddExternalFirewallCmd; import com.cloud.api.commands.AddSrxFirewallCmd; @@ -88,6 +89,7 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value = NetworkElement.class) public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider, PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, JuniperSRXFirewallElementService { diff --git a/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java b/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java index 56734669020..9954e800ab3 100644 --- a/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java +++ b/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java @@ -36,6 +36,7 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import javax.ejb.Local; import java.util.Map; @@ -47,6 +48,7 @@ import java.util.Set; * Time: 1:38 PM */ +@Component @Local(value = NetworkElement.class) public class MidokuraMidonetElement extends AdapterBase implements ConnectivityProvider, PluggableService { private static final Logger s_logger = Logger.getLogger(MidokuraMidonetElement.class); diff --git a/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java b/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java index 0526b45ada9..ed0eb3cc537 100644 --- a/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java +++ b/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java @@ -23,6 +23,7 @@ import com.cloud.dc.DataCenter.NetworkType; import com.cloud.network.PhysicalNetwork; import com.cloud.offering.NetworkOffering; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import javax.ejb.Local; @@ -32,6 +33,7 @@ import javax.ejb.Local; * Time: 10:46 AM */ +@Component @Local(value = NetworkGuru.class) public class MidokuraMidonetGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(MidokuraMidonetGuestNetworkGuru.class); diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java index 44af53a0b64..30dd06db1aa 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.NetScalerPodVO; 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=NetScalerPodDao.class) @DB(txn=false) public class NetScalerPodDaoImpl extends GenericDaoBase implements NetScalerPodDao { diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 77aa4477d5a..d356e9e36ff 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -27,6 +27,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.api.Answer; @@ -107,6 +108,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.google.gson.Gson; +@Component @Local(value = NetworkElement.class) public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, IpDeployer, StaticNatServiceProvider { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java index 95bfc02e6dc..62662c54036 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java @@ -20,12 +20,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.NiciraNvpDeviceVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value=NiciraNvpDao.class) public class NiciraNvpDaoImpl extends GenericDaoBase implements NiciraNvpDao { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java index 31babbbe83e..b40aad48d36 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.network.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.NiciraNvpNicMappingVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value=NiciraNvpNicMappingDao.class) public class NiciraNvpNicMappingDaoImpl extends GenericDaoBase implements NiciraNvpNicMappingDao { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java index 1fcccdb1ee3..231d68308fe 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java @@ -45,6 +45,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.CreateLogicalSwitchPortAnswer; @@ -110,6 +111,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; +@Component @Local(value = NetworkElement.class) public class NiciraNvpElement extends AdapterBase implements ConnectivityProvider, NiciraNvpElementService, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(NiciraNvpElement.class); diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java index bf785e6710c..6e9a92dfe53 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java @@ -22,6 +22,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; @@ -41,6 +43,7 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value = NetworkElement.class) public class OvsElement extends AdapterBase implements NetworkElement { @Inject 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 16e1ecc1cec..413e2f819a2 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 @@ -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.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; @@ -50,6 +51,7 @@ 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/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java index 1699732e45e..cc67e20dc72 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java @@ -27,6 +27,7 @@ import javax.naming.ConfigurationException; import javax.persistence.EntityExistsException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -63,6 +64,7 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; +@Component @Local(value={OvsTunnelManager.class}) public class OvsTunnelManagerImpl implements OvsTunnelManager { public static final Logger s_logger = diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java index 8794763bcdc..99d7d0d729d 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java @@ -21,11 +21,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value = { OvsTunnelInterfaceDao.class }) public class OvsTunnelInterfaceDaoImpl extends GenericDaoBase implements OvsTunnelInterfaceDao { diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java index 6e0c02c9290..099b3ba19ae 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java @@ -21,11 +21,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value = { OvsTunnelNetworkDao.class }) public class OvsTunnelNetworkDaoImpl extends GenericDaoBase implements OvsTunnelNetworkDao { diff --git a/plugins/storage-allocators/random/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java b/plugins/storage-allocators/random/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java index 919270349a9..812867ee69d 100644 --- a/plugins/storage-allocators/random/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java +++ b/plugins/storage-allocators/random/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.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.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; @@ -33,6 +34,7 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=StoragePoolAllocator.class) public class RandomStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(RandomStoragePoolAllocator.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 7c6e52f6659..a5733cad3f0 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 @@ -31,6 +31,7 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.ApiConstants.LDAPParams; import com.cloud.configuration.Config; @@ -42,6 +43,7 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.crypt.DBEncryptionUtil; +@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 f4b6f021f3b..edba766ec9e 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 @@ -21,6 +21,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.server.ManagementServer; import com.cloud.user.UserAccount; @@ -32,6 +33,7 @@ import com.cloud.utils.component.ComponentLocator; * 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/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java b/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java index 006daf98e9b..dfd3cfae5cd 100644 --- a/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java +++ b/plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.server.ManagementServer; import com.cloud.user.UserAccount; @@ -32,6 +33,7 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={UserAuthenticator.class}) public class PlainTextUserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(PlainTextUserAuthenticator.class); diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java index 6bc2cd39814..7a5baa116e8 100755 --- a/server/src/com/cloud/acl/DomainChecker.java +++ b/server/src/com/cloud/acl/DomainChecker.java @@ -18,6 +18,8 @@ package com.cloud.acl; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.api.BaseCmd; import com.cloud.dc.DataCenter; import com.cloud.domain.Domain; @@ -39,6 +41,7 @@ import com.cloud.user.dao.AccountDao; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.Inject; +@Component @Local(value=SecurityChecker.class) public class DomainChecker extends AdapterBase implements SecurityChecker { diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 62e8acb0642..30a717f948a 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.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.Listener; @@ -138,6 +139,7 @@ import edu.emory.mathcs.backport.java.util.Collections; * ping.interval before announcing an agent has timed out | float | 2.0x || || router.stats.interval | interval to * report router statistics | seconds | 300s || * } **/ +@Component @Local(value = { AgentManager.class }) public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { private static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class); diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index 65ff8f0de6a..8d2fabeb7fc 100755 --- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -43,6 +43,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -88,6 +89,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.nio.Link; import com.cloud.utils.nio.Task; +@Component @Local(value = { AgentManager.class, ClusteredAgentRebalanceService.class }) public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService { final static Logger s_logger = Logger.getLogger(ClusteredAgentManagerImpl.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 2a5258c3bd1..c2ebee9fe82 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java @@ -26,6 +26,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.capacity.CapacityManager; @@ -63,6 +64,7 @@ import com.cloud.vm.dao.VMInstanceDao; /** * An allocator that tries to find a fit on a computing host. This allocator does not care whether or not the host supports routing. */ +@Component @Local(value={HostAllocator.class}) public class FirstFitAllocator implements HostAllocator { private static final Logger s_logger = Logger.getLogger(FirstFitAllocator.class); 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 46ac3ac29e8..73155fd0023 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java @@ -20,6 +20,8 @@ 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; import com.cloud.deploy.DeploymentPlanner.ExcludeList; @@ -28,6 +30,7 @@ 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/RecreateHostAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java index b54e333c0f1..cb09a273ed7 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.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.manager.allocator.HostAllocator; @@ -54,6 +55,7 @@ import com.cloud.utils.component.Inject; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=HostAllocator.class) public class RecreateHostAllocator extends FirstFitRoutingAllocator { private final static Logger s_logger = Logger.getLogger(RecreateHostAllocator.class); diff --git a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java index 66385c0ee8d..c80ab405c86 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; @@ -33,6 +35,7 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value={HostAllocator.class}) public class TestingAllocator implements HostAllocator { HostDao _hostDao; 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 f290e39a229..9b03ece954d 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.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.manager.allocator.PodAllocator; import com.cloud.capacity.CapacityVO; @@ -58,6 +59,7 @@ 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 { private final static Logger s_logger = Logger.getLogger(UserConcentratedAllocator.class); diff --git a/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java b/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java index 8af04169495..aec6df18470 100644 --- a/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java +++ b/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.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.agent.AgentManager; import com.cloud.agent.StartupCommandProcessor; @@ -33,6 +34,7 @@ import com.cloud.exception.ConnectionException; import com.cloud.host.dao.HostDao; import com.cloud.utils.component.Inject; +@Component @Local(value={AgentAuthorizer.class, StartupCommandProcessor.class}) public class BasicAgentAuthManager implements AgentAuthorizer, StartupCommandProcessor { private static final Logger s_logger = Logger.getLogger(BasicAgentAuthManager.class); diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index 9c0cbb322fb..e4ae95d2a66 100755 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -38,6 +38,7 @@ import javax.mail.internet.InternetAddress; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.alert.dao.AlertDao; import com.cloud.api.ApiDBUtils; @@ -79,6 +80,7 @@ import com.sun.mail.smtp.SMTPMessage; import com.sun.mail.smtp.SMTPSSLTransport; import com.sun.mail.smtp.SMTPTransport; +@Component @Local(value={AlertManager.class}) public class AlertManagerImpl implements AlertManager { private static final Logger s_logger = Logger.getLogger(AlertManagerImpl.class.getName()); diff --git a/server/src/com/cloud/alert/ClusterAlertAdapter.java b/server/src/com/cloud/alert/ClusterAlertAdapter.java index 80a64b4e571..ed2a1eda89d 100644 --- a/server/src/com/cloud/alert/ClusterAlertAdapter.java +++ b/server/src/com/cloud/alert/ClusterAlertAdapter.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.cluster.ClusterManager; import com.cloud.cluster.ClusterNodeJoinEventArgs; @@ -33,6 +34,7 @@ import com.cloud.utils.db.GlobalLock; import com.cloud.utils.events.EventArgs; import com.cloud.utils.events.SubscriptionMgr; +@Component @Local(value = AlertAdapter.class) public class ClusterAlertAdapter implements AlertAdapter { diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java index 6e69c66b909..cd6225617ed 100644 --- a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java +++ b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.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.alert.AlertAdapter; import com.cloud.alert.AlertManager; @@ -34,6 +35,7 @@ import com.cloud.utils.events.SubscriptionMgr; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.dao.ConsoleProxyDao; +@Component @Local(value=AlertAdapter.class) public class ConsoleProxyAlertAdapter implements AlertAdapter { diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java index 05e8f11b59e..42ce73a92db 100644 --- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java +++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.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.alert.AlertAdapter; import com.cloud.alert.AlertManager; @@ -35,6 +36,7 @@ import com.cloud.utils.events.SubscriptionMgr; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.dao.SecondaryStorageVmDao; +@Component @Local(value=AlertAdapter.class) public class SecondaryStorageVmAlertAdapter implements AlertAdapter { diff --git a/server/src/com/cloud/alert/dao/AlertDaoImpl.java b/server/src/com/cloud/alert/dao/AlertDaoImpl.java index 9ab45cc57f2..2f3be882edd 100755 --- a/server/src/com/cloud/alert/dao/AlertDaoImpl.java +++ b/server/src/com/cloud/alert/dao/AlertDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.alert.AlertVO; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value = { AlertDao.class }) public class AlertDaoImpl extends GenericDaoBase implements AlertDao { @Override diff --git a/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java b/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java index 5676b7c8aa2..d2b22f42b5f 100644 --- a/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java +++ b/server/src/com/cloud/async/AsyncJobExecutorContextImpl.java @@ -21,6 +21,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.agent.AgentManager; import com.cloud.async.dao.AsyncJobDao; import com.cloud.event.dao.EventDao; @@ -39,6 +41,7 @@ import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; +@Component @Local(value={AsyncJobExecutorContext.class}) public class AsyncJobExecutorContextImpl implements AsyncJobExecutorContext { private String _name; diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index 585ba39b2da..00546fb9574 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -36,6 +36,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.apache.log4j.NDC; +import org.springframework.stereotype.Component; import com.cloud.api.ApiDispatcher; import com.cloud.api.ApiGsonHelper; @@ -74,6 +75,7 @@ import com.cloud.utils.net.MacAddress; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +@Component @Local(value={AsyncJobManager.class}) public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListener { public static final Logger s_logger = Logger.getLogger(AsyncJobManagerImpl.class.getName()); diff --git a/server/src/com/cloud/async/SyncQueueManagerImpl.java b/server/src/com/cloud/async/SyncQueueManagerImpl.java index b5f3c4fd92e..f316ff64610 100644 --- a/server/src/com/cloud/async/SyncQueueManagerImpl.java +++ b/server/src/com/cloud/async/SyncQueueManagerImpl.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.async.dao.SyncQueueDao; import com.cloud.async.dao.SyncQueueItemDao; @@ -34,6 +35,7 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={SyncQueueManager.class}) public class SyncQueueManagerImpl implements SyncQueueManager { public static final Logger s_logger = Logger.getLogger(SyncQueueManagerImpl.class.getName()); diff --git a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java index db008eae86e..4793a6edc12 100644 --- a/server/src/com/cloud/async/dao/AsyncJobDaoImpl.java +++ b/server/src/com/cloud/async/dao/AsyncJobDaoImpl.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.async.AsyncJob; import com.cloud.async.AsyncJobResult; @@ -35,6 +36,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value = { AsyncJobDao.class }) public class AsyncJobDaoImpl extends GenericDaoBase implements AsyncJobDao { private static final Logger s_logger = Logger.getLogger(AsyncJobDaoImpl.class.getName()); diff --git a/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java b/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java index 49c6c4e49f8..599e345901c 100644 --- a/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java +++ b/server/src/com/cloud/async/dao/SyncQueueDaoImpl.java @@ -24,6 +24,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.async.SyncQueueVO; import com.cloud.utils.DateUtil; @@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value = { SyncQueueDao.class }) public class SyncQueueDaoImpl extends GenericDaoBase implements SyncQueueDao { private static final Logger s_logger = Logger.getLogger(SyncQueueDaoImpl.class.getName()); diff --git a/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java b/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java index 814777da797..6d7342cbb50 100644 --- a/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java +++ b/server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java @@ -25,8 +25,10 @@ import java.util.List; import java.util.TimeZone; import javax.ejb.Local; +import javax.inject.Inject; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.async.SyncQueueItemVO; import com.cloud.async.SyncQueueVO; @@ -38,11 +40,13 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value = { SyncQueueItemDao.class }) public class SyncQueueItemDaoImpl extends GenericDaoBase implements SyncQueueItemDao { private static final Logger s_logger = Logger.getLogger(SyncQueueItemDaoImpl.class); - private final SyncQueueDao _syncQueueDao = new SyncQueueDaoImpl(); + // private final SyncQueueDao _syncQueueDao = new SyncQueueDaoImpl(); + @Inject private SyncQueueDao _syncQueueDao; @Override public SyncQueueItemVO getNextQueueItem(long queueId) { diff --git a/server/src/com/cloud/baremetal/BareMetalDiscoverer.java b/server/src/com/cloud/baremetal/BareMetalDiscoverer.java index 944e3714550..3290eb46a49 100755 --- a/server/src/com/cloud/baremetal/BareMetalDiscoverer.java +++ b/server/src/com/cloud/baremetal/BareMetalDiscoverer.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.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; @@ -57,6 +58,7 @@ 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 9c1e0911b35..f0e6ee6c086 100755 --- a/server/src/com/cloud/baremetal/BareMetalGuru.java +++ b/server/src/com/cloud/baremetal/BareMetalGuru.java @@ -18,6 +18,8 @@ package com.cloud.baremetal; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.HypervisorGuru; @@ -29,6 +31,7 @@ import com.cloud.utils.component.Inject; 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/baremetal/BareMetalPingServiceImpl.java b/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java index 75c7551cbae..23b467aa9a4 100755 --- a/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java @@ -24,6 +24,7 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.api.Answer; import com.cloud.agent.api.baremetal.PreparePxeServerAnswer; @@ -47,6 +48,7 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=PxeServerService.class) public class BareMetalPingServiceImpl extends BareMetalPxeServiceBase implements PxeServerService { private static final Logger s_logger = Logger.getLogger(BareMetalPingServiceImpl.class); diff --git a/server/src/com/cloud/baremetal/BareMetalResourceBase.java b/server/src/com/cloud/baremetal/BareMetalResourceBase.java index 8c14ccecf2e..2f679e7d678 100755 --- a/server/src/com/cloud/baremetal/BareMetalResourceBase.java +++ b/server/src/com/cloud/baremetal/BareMetalResourceBase.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.IAgentControl; import com.cloud.agent.api.Answer; @@ -65,6 +66,7 @@ import com.cloud.utils.script.Script2.ParamType; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value = ServerResource.class) public class BareMetalResourceBase implements ServerResource { private static final Logger s_logger = Logger.getLogger(BareMetalResourceBase.class); diff --git a/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java b/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java index 0da4029784e..e85442d9b5f 100755 --- a/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java +++ b/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -60,6 +61,7 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; +@Component @Local(value = {ExternalDhcpManager.class}) public class ExternalDhcpManagerImpl implements ExternalDhcpManager, ResourceStateAdapter { private static final org.apache.log4j.Logger s_logger = Logger.getLogger(ExternalDhcpManagerImpl.class); diff --git a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java index efbccfa2092..0d992b01977 100755 --- a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java +++ b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java @@ -24,6 +24,8 @@ 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.StartupCommand; import com.cloud.agent.api.StartupPxeServerCommand; @@ -46,6 +48,7 @@ import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfile.Param; +@Component @Local(value = {PxeServerManager.class}) public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdapter { private static final org.apache.log4j.Logger s_logger = Logger.getLogger(PxeServerManagerImpl.class); diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index c410109b9ef..4f0ce634848 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.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; @@ -78,6 +79,7 @@ import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = CapacityManager.class) public class CapacityManagerImpl implements CapacityManager, StateListener, Listener, ResourceListener { private static final Logger s_logger = Logger.getLogger(CapacityManagerImpl.class); diff --git a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java index a2df475b78c..620300a1a16 100755 --- a/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java +++ b/server/src/com/cloud/capacity/dao/CapacityDaoImpl.java @@ -27,6 +27,7 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; @@ -47,6 +48,7 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = { CapacityDao.class }) public class CapacityDaoImpl extends GenericDaoBase implements CapacityDao { private static final Logger s_logger = Logger.getLogger(CapacityDaoImpl.class); diff --git a/server/src/com/cloud/certificate/dao/CertificateDaoImpl.java b/server/src/com/cloud/certificate/dao/CertificateDaoImpl.java index ec49c8e01cb..f071cea60e6 100644 --- a/server/src/com/cloud/certificate/dao/CertificateDaoImpl.java +++ b/server/src/com/cloud/certificate/dao/CertificateDaoImpl.java @@ -25,11 +25,13 @@ import java.io.IOException; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.certificate.CertificateVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; +@Component @Local(value={CertificateDao.class}) @DB(txn=false) public class CertificateDaoImpl extends GenericDaoBase implements CertificateDao { diff --git a/server/src/com/cloud/cluster/CheckPointManagerImpl.java b/server/src/com/cloud/cluster/CheckPointManagerImpl.java index 784e33a435a..f6d9de5fb77 100644 --- a/server/src/com/cloud/cluster/CheckPointManagerImpl.java +++ b/server/src/com/cloud/cluster/CheckPointManagerImpl.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.cluster.dao.StackMaidDao; import com.cloud.configuration.Config; @@ -42,6 +43,7 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.GlobalLock; +@Component @Local(value=CheckPointManager.class) public class CheckPointManagerImpl implements CheckPointManager, Manager, ClusterManagerListener { private static final Logger s_logger = Logger.getLogger(CheckPointManagerImpl.class); diff --git a/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java b/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java index f0fe648993d..a2ead984c6a 100644 --- a/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java +++ b/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java @@ -23,9 +23,11 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.utils.component.Inject; +@Component @Local(value={ClusterFenceManager.class}) public class ClusterFenceManagerImpl implements ClusterFenceManager, ClusterManagerListener { private static final Logger s_logger = Logger.getLogger(ClusterFenceManagerImpl.class); diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java index 4dbb16c93c2..2f057a0ce55 100755 --- a/server/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java @@ -44,6 +44,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; @@ -89,6 +90,7 @@ import com.cloud.utils.mgmt.JmxUtil; import com.cloud.utils.net.NetUtils; import com.google.gson.Gson; +@Component @Local(value = { ClusterManager.class }) public class ClusterManagerImpl implements ClusterManager { private static final Logger s_logger = Logger.getLogger(ClusterManagerImpl.class); diff --git a/server/src/com/cloud/cluster/ClusterServiceServletAdapter.java b/server/src/com/cloud/cluster/ClusterServiceServletAdapter.java index bf2b6f9aad7..89e3cc0e033 100644 --- a/server/src/com/cloud/cluster/ClusterServiceServletAdapter.java +++ b/server/src/com/cloud/cluster/ClusterServiceServletAdapter.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.cluster.dao.ManagementServerHostDao; import com.cloud.configuration.Config; @@ -36,6 +37,7 @@ import com.cloud.utils.NumbersUtil; import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.ComponentLocator; +@Component @Local(value={ClusterServiceAdapter.class}) public class ClusterServiceServletAdapter implements ClusterServiceAdapter { diff --git a/server/src/com/cloud/cluster/DummyClusterManagerImpl.java b/server/src/com/cloud/cluster/DummyClusterManagerImpl.java index 54ac621d9a7..767692536fc 100755 --- a/server/src/com/cloud/cluster/DummyClusterManagerImpl.java +++ b/server/src/com/cloud/cluster/DummyClusterManagerImpl.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.agent.Listener; import com.cloud.agent.api.Answer; @@ -32,6 +33,7 @@ import com.cloud.host.Status.Event; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.MacAddress; +@Component @Local(value={ClusterManager.class}) public class DummyClusterManagerImpl implements ClusterManager { private static final Logger s_logger = Logger.getLogger(DummyClusterManagerImpl.class); diff --git a/server/src/com/cloud/cluster/ManagementServerNode.java b/server/src/com/cloud/cluster/ManagementServerNode.java index 991973a4586..e3a630316bc 100755 --- a/server/src/com/cloud/cluster/ManagementServerNode.java +++ b/server/src/com/cloud/cluster/ManagementServerNode.java @@ -18,10 +18,13 @@ package com.cloud.cluster; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.component.SystemIntegrityChecker; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.MacAddress; +@Component @Local(value = {SystemIntegrityChecker.class}) public class ManagementServerNode implements SystemIntegrityChecker { private static final long s_nodeId = MacAddress.getMacAddress().toLong(); diff --git a/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java index c93e3cb01ca..b58a1a864a4 100755 --- a/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java +++ b/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.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.host.Host; import com.cloud.host.HostVO; @@ -38,7 +39,7 @@ import com.cloud.utils.db.SearchCriteria2; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.SearchCriteriaService; - +@Component @Local(value=AgentLoadBalancerPlanner.class) public class ClusterBasedAgentLoadBalancerPlanner implements AgentLoadBalancerPlanner{ private static final Logger s_logger = Logger.getLogger(AgentLoadBalancerPlanner.class); diff --git a/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java b/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java index 92c3a5d3218..bf629896907 100644 --- a/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java +++ b/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.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.cluster.agentlb.HostTransferMapVO; import com.cloud.cluster.agentlb.HostTransferMapVO.HostTransferState; @@ -30,6 +31,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value = { HostTransferMapDao.class }) @DB(txn = false) public class HostTransferMapDaoImpl extends GenericDaoBase implements HostTransferMapDao { diff --git a/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java b/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java index 879c4ce3a27..3866da1bed3 100644 --- a/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java +++ b/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.cluster.ClusterInvalidSessionException; import com.cloud.cluster.ManagementServerHost; @@ -41,6 +42,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={ManagementServerHostDao.class}) public class ManagementServerHostDaoImpl extends GenericDaoBase implements ManagementServerHostDao { private static final Logger s_logger = Logger.getLogger(ManagementServerHostDaoImpl.class); diff --git a/server/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java b/server/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java index 8ef2e82a943..8ad02cdbeed 100644 --- a/server/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java +++ b/server/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.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.cluster.ManagementServerHost; import com.cloud.cluster.ManagementServerHostPeerVO; @@ -30,6 +31,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={ManagementServerHostPeerDao.class}) public class ManagementServerHostPeerDaoImpl extends GenericDaoBase implements ManagementServerHostPeerDao { private static final Logger s_logger = Logger.getLogger(ManagementServerHostPeerDaoImpl.class); diff --git a/server/src/com/cloud/cluster/dao/StackMaidDaoImpl.java b/server/src/com/cloud/cluster/dao/StackMaidDaoImpl.java index 93a43f9259e..243b00ff4a3 100644 --- a/server/src/com/cloud/cluster/dao/StackMaidDaoImpl.java +++ b/server/src/com/cloud/cluster/dao/StackMaidDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.cluster.CheckPointVO; import com.cloud.serializer.SerializerHelper; @@ -39,6 +40,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +@Component @Local(value = { StackMaidDao.class }) @DB(txn=false) public class StackMaidDaoImpl extends GenericDaoBase implements StackMaidDao { private static final Logger s_logger = Logger.getLogger(StackMaidDaoImpl.class); diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index ef940e89f61..a5f02dfa8bc 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -39,6 +39,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.SecurityChecker; import com.cloud.alert.AlertManager; @@ -166,6 +167,7 @@ import com.cloud.vm.dao.NicDao; import edu.emory.mathcs.backport.java.util.Arrays; +@Component @Local(value = { ConfigurationManager.class, ConfigurationService.class }) public class ConfigurationManagerImpl implements ConfigurationManager, ConfigurationService { public static final Logger s_logger = Logger.getLogger(ConfigurationManagerImpl.class.getName()); diff --git a/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java b/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java index 8c8d7843cc5..f185e438e84 100644 --- a/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java +++ b/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.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.configuration.ConfigurationVO; import com.cloud.utils.crypt.DBEncryptionUtil; @@ -36,6 +37,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={ConfigurationDao.class}) public class ConfigurationDaoImpl extends GenericDaoBase implements ConfigurationDao { private static final Logger s_logger = Logger.getLogger(ConfigurationDaoImpl.class); diff --git a/server/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/server/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java index 2843039827e..0f3d56eede9 100644 --- a/server/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/server/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -23,6 +23,8 @@ import java.util.Set; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.configuration.Resource; import com.cloud.configuration.Resource.ResourceOwnerType; import com.cloud.configuration.Resource.ResourceType; @@ -38,6 +40,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={ResourceCountDao.class}) public class ResourceCountDaoImpl extends GenericDaoBase implements ResourceCountDao { private SearchBuilder TypeSearch; diff --git a/server/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java b/server/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java index 3a35436abc6..d337070e921 100644 --- a/server/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java +++ b/server/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.configuration.Resource; import com.cloud.configuration.Resource.ResourceOwnerType; import com.cloud.configuration.Resource.ResourceType; @@ -30,6 +32,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value = { ResourceLimitDao.class }) public class ResourceLimitDaoImpl extends GenericDaoBase implements ResourceLimitDao { private SearchBuilder IdTypeSearch; diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java index 01b4720a54f..a3f996edbbf 100755 --- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.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.agent.AgentManager; import com.cloud.agent.api.AgentControlAnswer; @@ -62,6 +63,7 @@ import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = { ConsoleProxyManager.class }) public class AgentBasedConsoleProxyManager implements ConsoleProxyManager, VirtualMachineGuru, AgentHook { private static final Logger s_logger = Logger.getLogger(AgentBasedConsoleProxyManager.class); diff --git a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java index 6172780e534..13aa3e6bb31 100644 --- a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.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.host.Host; import com.cloud.host.HostVO; import com.cloud.info.ConsoleProxyInfo; import com.cloud.vm.UserVmVO; +@Component @Local(value={ConsoleProxyManager.class}) public class AgentBasedStandaloneConsoleProxyManager extends AgentBasedConsoleProxyManager { diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java index 7cd851dc29f..20cf91a25a5 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java @@ -25,6 +25,8 @@ import java.util.Random; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.ComponentLocator; @@ -32,6 +34,7 @@ import com.cloud.vm.ConsoleProxyVO; import edu.emory.mathcs.backport.java.util.Collections; +@Component @Local(value={ConsoleProxyAllocator.class}) public class ConsoleProxyBalanceAllocator implements ConsoleProxyAllocator { diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index d7875f72ee5..31133269558 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -32,6 +32,7 @@ import javax.naming.ConfigurationException; import javax.persistence.Table; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.AgentControlAnswer; @@ -170,6 +171,7 @@ import com.google.gson.GsonBuilder; // Starting, HA, Migrating, Running state are all counted as "Open" for available capacity calculation // because sooner or later, it will be driven into Running state // +@Component @Local(value = { ConsoleProxyManager.class, ConsoleProxyService.class }) public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProxyService, Manager, AgentHook, VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(ConsoleProxyManagerImpl.class); diff --git a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java index d2df83c5409..a60ae522891 100755 --- a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.host.Host.Type; import com.cloud.host.HostVO; @@ -32,6 +34,7 @@ import com.cloud.utils.component.Inject; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.ConsoleProxyDao; +@Component @Local(value={ConsoleProxyManager.class}) public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager implements ConsoleProxyManager { String _ip = null; diff --git a/server/src/com/cloud/dao/EntityManagerImpl.java b/server/src/com/cloud/dao/EntityManagerImpl.java index 1430c0834b2..42d35c91eec 100644 --- a/server/src/com/cloud/dao/EntityManagerImpl.java +++ b/server/src/com/cloud/dao/EntityManagerImpl.java @@ -23,6 +23,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import net.sf.ehcache.Cache; import com.cloud.utils.component.Manager; @@ -32,6 +34,7 @@ import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value=EntityManager.class) @SuppressWarnings("unchecked") public class EntityManagerImpl implements EntityManager, Manager { diff --git a/server/src/com/cloud/dc/ClusterDetailsDaoImpl.java b/server/src/com/cloud/dc/ClusterDetailsDaoImpl.java index 4ee63c42890..4c8591870bd 100755 --- a/server/src/com/cloud/dc/ClusterDetailsDaoImpl.java +++ b/server/src/com/cloud/dc/ClusterDetailsDaoImpl.java @@ -22,12 +22,15 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.crypt.DBEncryptionUtil; 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=ClusterDetailsDao.class) public class ClusterDetailsDaoImpl extends GenericDaoBase implements ClusterDetailsDao { protected final SearchBuilder ClusterSearch; diff --git a/server/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java b/server/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java index 1ef5f23eed1..e4c0652aaf4 100644 --- a/server/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java +++ b/server/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.dc.AccountVlanMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={AccountVlanMapDao.class}) public class AccountVlanMapDaoImpl extends GenericDaoBase implements AccountVlanMapDao { diff --git a/server/src/com/cloud/dc/dao/ClusterDaoImpl.java b/server/src/com/cloud/dc/dao/ClusterDaoImpl.java index c85d03c159f..9edf7dbb6d0 100644 --- a/server/src/com/cloud/dc/dao/ClusterDaoImpl.java +++ b/server/src/com/cloud/dc/dao/ClusterDaoImpl.java @@ -26,6 +26,8 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.dc.ClusterVO; import com.cloud.dc.HostPodVO; import com.cloud.hypervisor.Hypervisor.HypervisorType; @@ -41,6 +43,7 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value=ClusterDao.class) public class ClusterDaoImpl extends GenericDaoBase implements ClusterDao { diff --git a/server/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/server/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java index 5a126814f93..b12fa9dc007 100644 --- a/server/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java +++ b/server/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java @@ -19,6 +19,8 @@ package com.cloud.dc.dao; import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.dc.ClusterVSMMapVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @@ -26,6 +28,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value=ClusterVSMMapDao.class) @DB(txn = false) public class ClusterVSMMapDaoImpl extends GenericDaoBase implements ClusterVSMMapDao { diff --git a/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java index ff435e89c4c..9d700bea0da 100755 --- a/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java @@ -25,6 +25,7 @@ import javax.naming.ConfigurationException; import javax.persistence.TableGenerator; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.dc.DataCenterIpAddressVO; import com.cloud.dc.DataCenterLinkLocalIpAddressVO; @@ -50,6 +51,7 @@ import com.cloud.utils.net.NetUtils; * || mac.address.prefix | prefix to attach to all public and private mac addresses | number | 06 || * } **/ +@Component @Local(value={DataCenterDao.class}) public class DataCenterDaoImpl extends GenericDaoBase implements DataCenterDao { private static final Logger s_logger = Logger.getLogger(DataCenterDaoImpl.class); diff --git a/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java index 190b6258eed..ba7dd44e2c9 100755 --- a/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.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.DataCenterIpAddressVO; import com.cloud.utils.db.DB; @@ -36,6 +37,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; +@Component @Local(value={DataCenterIpAddressDao.class}) @DB(txn=false) public class DataCenterIpAddressDaoImpl extends GenericDaoBase implements DataCenterIpAddressDao { private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class); diff --git a/server/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java index 1a1c0793f47..b7a30edb77b 100644 --- a/server/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.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.dc.DataCenterLinkLocalIpAddressVO; import com.cloud.utils.db.DB; @@ -39,6 +40,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; +@Component @Local(value={DataCenterLinkLocalIpAddressDaoImpl.class}) @DB(txn=false) public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase implements GenericDao { private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class); diff --git a/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java index e0b19da8b9c..bdfb8cc58ad 100755 --- a/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java @@ -21,6 +21,8 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +import org.springframework.stereotype.Component; + import com.cloud.dc.DataCenterVnetVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDao; @@ -37,6 +39,7 @@ import com.cloud.utils.exception.CloudRuntimeException; * DataCenterVnetDaoImpl maintains the one-to-many relationship between * data center/physical_network and the vnet that appears within the physical network. */ +@Component @DB(txn=false) public class DataCenterVnetDaoImpl extends GenericDaoBase implements GenericDao { private final SearchBuilder FreeVnetSearch; diff --git a/server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java b/server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java index 923dd5b06fd..fe079064fc8 100644 --- a/server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java @@ -22,12 +22,15 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.dc.DcDetailVO; 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=DcDetailsDao.class) public class DcDetailsDaoImpl extends GenericDaoBase implements DcDetailsDao { protected final SearchBuilder DcSearch; diff --git a/server/src/com/cloud/dc/dao/HostPodDaoImpl.java b/server/src/com/cloud/dc/dao/HostPodDaoImpl.java index bec8c518cdf..91106670ae4 100644 --- a/server/src/com/cloud/dc/dao/HostPodDaoImpl.java +++ b/server/src/com/cloud/dc/dao/HostPodDaoImpl.java @@ -26,6 +26,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.dc.HostPodVO; import com.cloud.org.Grouping; @@ -36,6 +37,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +@Component @Local(value={HostPodDao.class}) public class HostPodDaoImpl extends GenericDaoBase implements HostPodDao { private static final Logger s_logger = Logger.getLogger(HostPodDaoImpl.class); diff --git a/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java b/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java index 6c0ff7d15f9..84918b08c99 100755 --- a/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java +++ b/server/src/com/cloud/dc/dao/PodVlanDaoImpl.java @@ -21,6 +21,8 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +import org.springframework.stereotype.Component; + import com.cloud.dc.PodVlanVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.GenericDaoBase; @@ -32,6 +34,7 @@ import com.cloud.utils.exception.CloudRuntimeException; /** * PodVlanDaoImpl maintains the one-to-many relationship between */ +@Component public class PodVlanDaoImpl extends GenericDaoBase implements GenericDao { private final SearchBuilder FreeVlanSearch; private final SearchBuilder VlanPodSearch; diff --git a/server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java b/server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java index d6573e0c3ed..df7a5d95810 100644 --- a/server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java +++ b/server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.dc.PodVlanMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={PodVlanMapDao.class}) public class PodVlanMapDaoImpl extends GenericDaoBase implements PodVlanMapDao { diff --git a/server/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/server/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java index 250a1b8920b..782ee0d9727 100755 --- a/server/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java +++ b/server/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java @@ -23,6 +23,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.dc.DataCenterIpAddressVO; import com.cloud.dc.StorageNetworkIpAddressVO; import com.cloud.utils.db.DB; @@ -36,6 +38,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value={StorageNetworkIpAddressDao.class}) @DB(txn=false) public class StorageNetworkIpAddressDaoImpl extends GenericDaoBase implements StorageNetworkIpAddressDao { diff --git a/server/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java b/server/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java index c89af28efee..d732e6fcb7a 100755 --- a/server/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java +++ b/server/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.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.dc.StorageNetworkIpRangeVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; @@ -34,6 +36,7 @@ import com.cloud.utils.db.SearchCriteriaService; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value={StorageNetworkIpRangeDao.class}) @DB(txn=false) public class StorageNetworkIpRangeDaoImpl extends GenericDaoBase implements StorageNetworkIpRangeDao { diff --git a/server/src/com/cloud/dc/dao/VlanDaoImpl.java b/server/src/com/cloud/dc/dao/VlanDaoImpl.java index 5fe4b648374..28793a8259f 100644 --- a/server/src/com/cloud/dc/dao/VlanDaoImpl.java +++ b/server/src/com/cloud/dc/dao/VlanDaoImpl.java @@ -26,6 +26,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.dc.AccountVlanMapVO; import com.cloud.dc.PodVlanMapVO; import com.cloud.dc.Vlan; @@ -42,6 +44,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={VlanDao.class}) public class VlanDaoImpl extends GenericDaoBase implements VlanDao { diff --git a/server/src/com/cloud/deploy/BareMetalPlanner.java b/server/src/com/cloud/deploy/BareMetalPlanner.java index 7616a383d14..1fded3a66f0 100755 --- a/server/src/com/cloud/deploy/BareMetalPlanner.java +++ b/server/src/com/cloud/deploy/BareMetalPlanner.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.capacity.CapacityManager; import com.cloud.configuration.Config; @@ -46,6 +47,7 @@ import com.cloud.utils.component.Inject; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=DeploymentPlanner.class) public class BareMetalPlanner implements DeploymentPlanner { private static final Logger s_logger = Logger.getLogger(BareMetalPlanner.class); diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index 88b0cbd8965..091f230d8b3 100755 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.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.manager.allocator.HostAllocator; import com.cloud.api.ApiDBUtils; @@ -83,6 +84,7 @@ 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/domain/dao/DomainDaoImpl.java b/server/src/com/cloud/domain/dao/DomainDaoImpl.java index 442b5e5d5ad..3b17a14839d 100644 --- a/server/src/com/cloud/domain/dao/DomainDaoImpl.java +++ b/server/src/com/cloud/domain/dao/DomainDaoImpl.java @@ -26,6 +26,7 @@ import java.util.Set; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; @@ -36,6 +37,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={DomainDao.class}) public class DomainDaoImpl extends GenericDaoBase implements DomainDao { private static final Logger s_logger = Logger.getLogger(DomainDaoImpl.class); diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java index 31fc7afe4ba..55d929efd91 100644 --- a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java +++ b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java @@ -19,6 +19,7 @@ package com.cloud.ha; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.CheckVirtualMachineAnswer; @@ -32,6 +33,7 @@ import com.cloud.utils.component.Inject; 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/HighAvailabilityManagerExtImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java index b76baba7707..d7a9105253a 100644 --- a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java @@ -23,6 +23,8 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.alert.AlertManager; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.server.ManagementServer; @@ -31,6 +33,7 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.Inject; import com.cloud.utils.db.Transaction; +@Component @Local(value={HighAvailabilityManager.class}) public class HighAvailabilityManagerExtImpl extends HighAvailabilityManagerImpl { diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index b91e47de0ae..cd7bb104e73 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -31,6 +31,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import org.apache.log4j.NDC; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.alert.AlertManager; @@ -98,6 +99,7 @@ import com.cloud.vm.dao.VMInstanceDao; * ha.retry.wait | time to wait before retrying the work item | seconds | 120 || || stop.retry.wait | time to wait * before retrying the stop | seconds | 120 || * } **/ +@Component @Local(value = { HighAvailabilityManager.class }) public class HighAvailabilityManagerImpl implements HighAvailabilityManager, ClusterManagerListener { protected static final Logger s_logger = Logger.getLogger(HighAvailabilityManagerImpl.class); diff --git a/server/src/com/cloud/ha/KVMFencer.java b/server/src/com/cloud/ha/KVMFencer.java index ffb377365c8..214b9ee8011 100755 --- a/server/src/com/cloud/ha/KVMFencer.java +++ b/server/src/com/cloud/ha/KVMFencer.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.FenceAnswer; @@ -38,6 +39,7 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.Inject; import com.cloud.vm.VMInstanceVO; +@Component @Local(value=FenceBuilder.class) public class KVMFencer implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(KVMFencer.class); diff --git a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java index 8a5b02af282..5dc7af03e4c 100644 --- a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java +++ b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.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.host.HostVO; import com.cloud.host.Status; @@ -34,6 +35,7 @@ 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/RecreatableFencer.java b/server/src/com/cloud/ha/RecreatableFencer.java index 433c8ea6dcc..a718dafd08f 100644 --- a/server/src/com/cloud/ha/RecreatableFencer.java +++ b/server/src/com/cloud/ha/RecreatableFencer.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.host.HostVO; import com.cloud.storage.VolumeVO; @@ -31,6 +32,7 @@ import com.cloud.utils.component.Inject; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; +@Component @Local(value=FenceBuilder.class) public class RecreatableFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(RecreatableFencer.class); diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/com/cloud/ha/UserVmDomRInvestigator.java index 5a3e55025e7..d973df9c883 100644 --- a/server/src/com/cloud/ha/UserVmDomRInvestigator.java +++ b/server/src/com/cloud/ha/UserVmDomRInvestigator.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -42,6 +43,7 @@ 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 5d498e0ca09..1f9a23856c7 100755 --- a/server/src/com/cloud/ha/XenServerInvestigator.java +++ b/server/src/com/cloud/ha/XenServerInvestigator.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.agent.api.Answer; import com.cloud.agent.api.CheckOnHostAnswer; @@ -35,6 +36,7 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.Inject; 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/ha/dao/HighAvailabilityDaoImpl.java b/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java index 069ab7465ba..587c63a0935 100644 --- a/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java +++ b/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.ha.HaWorkVO; import com.cloud.ha.HighAvailabilityManager; @@ -35,6 +36,7 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={HighAvailabilityDao.class}) public class HighAvailabilityDaoImpl extends GenericDaoBase implements HighAvailabilityDao { private static final Logger s_logger = Logger.getLogger(HighAvailabilityDaoImpl.class); diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java index 990aef8d729..8045051e83a 100755 --- a/server/src/com/cloud/host/dao/HostDaoImpl.java +++ b/server/src/com/cloud/host/dao/HostDaoImpl.java @@ -29,6 +29,7 @@ import javax.ejb.Local; import javax.persistence.TableGenerator; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.cluster.agentlb.HostTransferMapVO; import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; @@ -60,6 +61,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = { HostDao.class }) @DB(txn = false) @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1) diff --git a/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java b/server/src/com/cloud/host/dao/HostDetailsDaoImpl.java index bf7cb72811c..43f7b07956b 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 implements HostDetailsDao { protected final SearchBuilder HostSearch; diff --git a/server/src/com/cloud/host/dao/HostTagsDaoImpl.java b/server/src/com/cloud/host/dao/HostTagsDaoImpl.java index 83ac3cc4f70..e98e7e29ec9 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 implements HostTagsDao { protected final SearchBuilder HostSearch; diff --git a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java index 5dd1694742d..950f4ec8ef4 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); diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java index 72a87d04762..f01d6d02ea5 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()); diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java index a756965dfb3..3089c1308ac 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; diff --git a/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java index 1a6fb726051..21afa81cffb 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 implements HypervisorCapabilitiesDao { diff --git a/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java b/server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java index 6a1cd67d8f3..6b617a77ad9 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); diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 03746e7b35b..9a10b39fd6b 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 { diff --git a/server/src/com/cloud/keystore/KeystoreDaoImpl.java b/server/src/com/cloud/keystore/KeystoreDaoImpl.java index 2c06138b3d8..0ea97c783b9 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 implements KeystoreDao { protected final SearchBuilder FindByNameSearch; diff --git a/server/src/com/cloud/keystore/KeystoreManagerImpl.java b/server/src/com/cloud/keystore/KeystoreManagerImpl.java index 6118ac3f3e0..ee739887991 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); diff --git a/server/src/com/cloud/maint/UpgradeManagerImpl.java b/server/src/com/cloud/maint/UpgradeManagerImpl.java index b4bc291bdc8..0b02598c7e8 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); diff --git a/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java b/server/src/com/cloud/maint/dao/AgentUpgradeDaoImpl.java index 76a99105320..80c6d851aef 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 implements AgentUpgradeDao { } diff --git a/server/src/com/cloud/migration/DiskOffering20DaoImpl.java b/server/src/com/cloud/migration/DiskOffering20DaoImpl.java index ac1066f4618..9008961a515 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 implements DiskOffering20Dao { } diff --git a/server/src/com/cloud/migration/DiskOffering21DaoImpl.java b/server/src/com/cloud/migration/DiskOffering21DaoImpl.java index 6de7d8f01c4..4526235e983 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 implements DiskOffering21Dao { } diff --git a/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java b/server/src/com/cloud/migration/ServiceOffering20DaoImpl.java index 92bde6c364a..5f3201d4b4c 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 implements ServiceOffering20Dao { } diff --git a/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java b/server/src/com/cloud/migration/ServiceOffering21DaoImpl.java index 0f68fd98f43..18a4df19f50 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 implements ServiceOffering21Dao { } diff --git a/server/src/com/cloud/network/ExteralIpAddressAllocator.java b/server/src/com/cloud/network/ExteralIpAddressAllocator.java index 799453570b1..10024d62d63 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); diff --git a/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java index 67494965505..0b772ba74c0 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 { diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index dfe720e08a2..feb6c7df1d2 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 { diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 25c0032316f..e2919625645 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); diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java index 13e5e241855..20425ea7cb3 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 { diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java index 598ade6342c..63cb969c40a 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); diff --git a/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/server/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java index 6c64bbc13af..ee26df9737e 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 implements ExternalFirewallDeviceDao { final SearchBuilder physicalNetworkServiceProviderSearch; diff --git a/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/server/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java index 18bc29e4127..6fddfa77f4e 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 implements ExternalLoadBalancerDeviceDao { final SearchBuilder physicalNetworkIdSearch; diff --git a/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java index ee89715d91a..85f3d8e0934 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 implements FirewallRulesCidrsDao { private static final Logger s_logger = Logger.getLogger(FirewallRulesCidrsDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java index a2478d8d497..73fdf2226a2 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 implements FirewallRulesDao { diff --git a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java b/server/src/com/cloud/network/dao/IPAddressDaoImpl.java index dba3566d1fb..28757d28e94 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 implements IPAddressDao { diff --git a/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java b/server/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java index 288e7237ba8..1d21d4f696d 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 implements InlineLoadBalancerNicMapDao { diff --git a/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java b/server/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java index a6c34a8208f..59e31f24440 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 implements diff --git a/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerDaoImpl.java index f624bfa92de..35f0692060e 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 implements LoadBalancerDao { private static final Logger s_logger = Logger.getLogger(LoadBalancerDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/server/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java index ab0e3ab602e..527b53f1b5e 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 implements LoadBalancerVMMapDao { diff --git a/server/src/com/cloud/network/dao/NetworkDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDaoImpl.java index cbfec895b32..71fcac9a761 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 implements NetworkDao { diff --git a/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/server/src/com/cloud/network/dao/NetworkDomainDaoImpl.java index 90c7d6f6474..ba7bb23a292 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 implements NetworkDomainDao { final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java b/server/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java index 7c4a2751563..a90da618b2d 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 implements NetworkExternalFirewallDao { diff --git a/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java b/server/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java index 334a977fd54..3995d564aa5 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 implements NetworkExternalLoadBalancerDao { diff --git a/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java b/server/src/com/cloud/network/dao/NetworkOpDaoImpl.java index 298156e067c..e2cda86f401 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 implements GenericDao { protected final SearchBuilder AllFieldsSearch; protected final GenericSearchBuilder ActiveNicsSearch; diff --git a/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/server/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java index fddd3c38f13..4d8b9d51e0d 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 implements NetworkRuleConfigDao { protected SearchBuilder SecurityGroupIdSearch; diff --git a/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java b/server/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java index 51c39920e8e..e603fd825aa 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 implements NetworkServiceMapDao { final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java index 792ead57a76..d96da6082eb 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 implements PhysicalNetworkDao { final SearchBuilder ZoneSearch; diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java index 873a28c4513..04508e72545 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 implements GenericDao { private final GenericSearchBuilder IsolationMethodSearch; private final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java index 0fc9806987c..16a23dd8fc9 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 implements PhysicalNetworkServiceProviderDao { final SearchBuilder physicalNetworkSearch; diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkTagDaoImpl.java index a1c98a74fee..c3e9f73d86b 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 implements GenericDao { private final GenericSearchBuilder TagSearch; private final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/server/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java index c89477db3a5..b93219a5b00 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 implements PhysicalNetworkTrafficTypeDao { final SearchBuilder physicalNetworkSearch; diff --git a/server/src/com/cloud/network/dao/PortProfileDaoImpl.java b/server/src/com/cloud/network/dao/PortProfileDaoImpl.java index dda2d3c1d3f..80e6368810b 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 implements PortProfileDao { protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/server/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java index e9be50007bd..d91226ea1ca 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 implements RemoteAccessVpnDao { private static final Logger s_logger = Logger.getLogger(RemoteAccessVpnDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java b/server/src/com/cloud/network/dao/RouterNetworkDaoImpl.java index e1eed28e9ef..06c6f8a5d63 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 implements GenericDao{ protected final GenericSearchBuilder RouterNetworksSearch; protected final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java index bf6900d87ee..449b2a9648b 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 implements Site2SiteCustomerGatewayDao { private static final Logger s_logger = Logger.getLogger(Site2SiteCustomerGatewayDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java index b1f9ef7b919..5e5e34e4f95 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 implements Site2SiteVpnConnectionDao { private static final Logger s_logger = Logger.getLogger(Site2SiteVpnConnectionDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/server/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java index 31a8f0ef450..5bf4b9428cd 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 implements Site2SiteVpnGatewayDao { protected final IPAddressDaoImpl _addrDao = ComponentLocator.inject(IPAddressDaoImpl.class); diff --git a/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java b/server/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java index a9be516255c..dba835f9e1c 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 implements VirtualRouterProviderDao { final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/network/dao/VpnUserDaoImpl.java b/server/src/com/cloud/network/dao/VpnUserDaoImpl.java index eca89266615..cd3de7949ed 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 implements VpnUserDao { private final SearchBuilder AccountSearch; diff --git a/server/src/com/cloud/network/element/BareMetalElement.java b/server/src/com/cloud/network/element/BareMetalElement.java index 842af833b6b..dbad2e8c781 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); diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java index ca88a72be7f..e57a83266d8 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); diff --git a/server/src/com/cloud/network/element/ExternalDhcpElement.java b/server/src/com/cloud/network/element/ExternalDhcpElement.java index 896cd85cd01..3e77e66f674 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); diff --git a/server/src/com/cloud/network/element/SecurityGroupElement.java b/server/src/com/cloud/network/element/SecurityGroupElement.java index 26b33c949e6..09b8df714ba 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> capabilities = setCapabilities(); diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index f3941b60996..c5fc57d5228 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, diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java index 77ae4d4d357..ad38e451a5e 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); diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index 82aa9d25809..43948c95587 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); diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java index 934cd70864e..4e09c1b243f 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); diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index ee824af5aef..fd7159e41e3 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); diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java index 354d7ed2714..f9360080aa9 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); diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java index 24d24f85521..a5019a14d54 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); diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index cebfb08e952..d34007f4bc6 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); diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java index b513325d5ee..10ebb135272 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); diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java index 9d4c9c327ff..4a795796797 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); diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index ddee5a588b2..74c083012b4 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); diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java index 879d0cdd7b5..a6b30de2c3b 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); diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index ba9923f47da..04a86c320f9 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 implements LoadBalancingRulesManager, LoadBalancingRulesService, Manager { private static final Logger s_logger = Logger.getLogger(LoadBalancingRulesManagerImpl.class); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 943c85fb179..c942aad3e3f 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, Listener { diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 3139998c5c3..ac73caca65d 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); diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 2383366850c..e7c720f1a5c 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); diff --git a/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/server/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java index 9363c1f1429..64c3f503bf2 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 implements PortForwardingRulesDao { diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index a1ed6d73e42..a1ab8a2e5dd 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 { public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class); diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java index 1f5026413af..eafb9bbdef3 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(); diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java index 81c20e3ccdb..27ab309a8ae 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 implements SecurityGroupDao { private SearchBuilder AccountIdSearch; diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java index 0dc93252713..bbce53fa313 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 implements SecurityGroupRuleDao { diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java index 798fa4f3b7c..f08ca05cd7a 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 implements SecurityGroupRulesDao { private SearchBuilder AccountGroupNameSearch; diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java index db6c0029447..da07e8b1f82 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 implements SecurityGroupVMMapDao { private SearchBuilder ListByIpAndVmId; diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java index e3dde51d206..dcd1238186e 100644 --- a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.ha.HaWorkVO; import com.cloud.network.security.SecurityGroupWork; @@ -36,6 +37,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={SecurityGroupWorkDao.class}) public class SecurityGroupWorkDaoImpl extends GenericDaoBase implements SecurityGroupWorkDao { private static final Logger s_logger = Logger.getLogger(SecurityGroupWorkDaoImpl.class); diff --git a/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java index 795dd0ef84e..746b66f5c1c 100644 --- a/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java +++ b/server/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java @@ -28,6 +28,7 @@ import java.util.Set; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.network.security.VmRulesetLogVO; import com.cloud.utils.db.GenericDaoBase; @@ -35,6 +36,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={VmRulesetLogDao.class}) public class VmRulesetLogDaoImpl extends GenericDaoBase implements VmRulesetLogDao { protected static Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class); diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java index 33757148523..5b64da0e73a 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.SecurityChecker.AccessType; import com.cloud.api.commands.ListNetworkACLsCmd; @@ -65,6 +66,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; +@Component @Local(value = { NetworkACLService.class, NetworkACLManager.class}) public class NetworkACLManagerImpl implements Manager,NetworkACLManager{ String _name; diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 675ae593fa7..a81e9816180 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -31,6 +31,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.ControlledEntity.ACLType; import com.cloud.api.commands.ListPrivateGatewaysCmd; @@ -116,6 +117,7 @@ import com.cloud.vm.ReservationContextImpl; import com.cloud.vm.dao.DomainRouterDao; +@Component @Local(value = { VpcManager.class, VpcService.class }) public class VpcManagerImpl implements VpcManager, Manager{ private static final Logger s_logger = Logger.getLogger(VpcManagerImpl.class); diff --git a/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java b/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java index 35b81a8e54c..ecab3bb6625 100644 --- a/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.network.vpc.PrivateIpVO; import com.cloud.utils.db.DB; @@ -33,7 +34,7 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; - +@Component @Local(value = PrivateIpDao.class) @DB(txn = false) public class PrivateIpDaoImpl extends GenericDaoBase implements PrivateIpDao { diff --git a/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java b/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java index b3077e7f178..42f0fc40bcd 100644 --- a/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.vpc.StaticRoute; import com.cloud.network.vpc.StaticRouteVO; import com.cloud.server.ResourceTag.TaggedResourceType; @@ -34,7 +36,7 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; - +@Component @Local(value = StaticRouteDao.class) @DB(txn = false) public class StaticRouteDaoImpl extends GenericDaoBase implements StaticRouteDao{ diff --git a/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java index ffc3542e1f8..a3bb7d5d1ce 100644 --- a/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.vpc.Vpc; import com.cloud.network.vpc.VpcVO; import com.cloud.server.ResourceTag.TaggedResourceType; @@ -34,7 +36,7 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; - +@Component @Local(value = VpcDao.class) @DB(txn = false) public class VpcDaoImpl extends GenericDaoBase implements VpcDao{ diff --git a/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java index 73649d6b44b..a1cd9340402 100644 --- a/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java @@ -18,6 +18,8 @@ package com.cloud.network.vpc.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.vpc.VpcGateway; import com.cloud.network.vpc.VpcGatewayVO; import com.cloud.utils.db.DB; @@ -25,7 +27,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; - +@Component @Local(value = VpcGatewayDao.class) @DB(txn = false) public class VpcGatewayDaoImpl extends GenericDaoBase implements VpcGatewayDao{ diff --git a/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java index 55cfd9515b7..2cda5471c14 100644 --- a/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java @@ -18,6 +18,8 @@ package com.cloud.network.vpc.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.vpc.VpcOfferingVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @@ -26,7 +28,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; - +@Component @Local(value = VpcOfferingDao.class) @DB(txn = false) public class VpcOfferingDaoImpl extends GenericDaoBase implements VpcOfferingDao{ diff --git a/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java index 056df7418d6..4b5f1b9620b 100644 --- a/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java +++ b/server/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.Network.Service; import com.cloud.network.vpc.VpcOfferingServiceMapVO; import com.cloud.utils.db.DB; @@ -29,7 +31,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; - +@Component @Local(value = VpcOfferingServiceMapDao.class) @DB(txn = false) public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase implements VpcOfferingServiceMapDao{ diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index c01dc6e91fe..73570aa6678 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.commands.ListRemoteAccessVpnsCmd; import com.cloud.api.commands.ListVpnUsersCmd; @@ -80,6 +81,7 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.net.NetUtils; +@Component @Local(value = RemoteAccessVpnService.class) public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manager { private final static Logger s_logger = Logger.getLogger(RemoteAccessVpnManagerImpl.class); diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index ae0f4ec7fa1..f26ef7ff1d0 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.commands.CreateVpnConnectionCmd; import com.cloud.api.commands.CreateVpnCustomerGatewayCmd; @@ -80,6 +81,7 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.DomainRouterVO; +@Component @Local(value = { Site2SiteVpnManager.class, Site2SiteVpnService.class } ) public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager { private static final Logger s_logger = Logger.getLogger(Site2SiteVpnManagerImpl.class); diff --git a/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java b/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java index 4d5f1fb7b95..d1e44242d2a 100644 --- a/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java +++ b/server/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.ejb.Local; import javax.persistence.EntityExistsException; +import org.springframework.stereotype.Component; + import com.cloud.network.Network; import com.cloud.network.Networks.TrafficType; import com.cloud.offering.NetworkOffering; @@ -34,6 +36,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +@Component @Local(value = NetworkOfferingDao.class) @DB(txn = false) public class NetworkOfferingDaoImpl extends GenericDaoBase implements NetworkOfferingDao { diff --git a/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java index b3144c6f652..7282443ff02 100644 --- a/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java +++ b/server/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.offerings.NetworkOfferingServiceMapVO; @@ -31,6 +33,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; +@Component @Local(value=NetworkOfferingServiceMapDao.class) @DB(txn=false) public class NetworkOfferingServiceMapDaoImpl extends GenericDaoBase implements NetworkOfferingServiceMapDao { diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index 77b778eb244..d9e59d66912 100755 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -39,6 +39,7 @@ import javax.mail.internet.InternetAddress; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.SecurityChecker.AccessType; import com.cloud.configuration.Config; @@ -88,6 +89,7 @@ import com.sun.mail.smtp.SMTPMessage; import com.sun.mail.smtp.SMTPSSLTransport; import com.sun.mail.smtp.SMTPTransport; +@Component @Local(value = { ProjectService.class, ProjectManager.class }) public class ProjectManagerImpl implements ProjectManager, Manager{ public static final Logger s_logger = Logger.getLogger(ProjectManagerImpl.class); diff --git a/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java index d18f692d726..b089e586a7e 100644 --- a/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java @@ -21,6 +21,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.projects.ProjectAccount; import com.cloud.projects.ProjectAccountVO; @@ -31,6 +32,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value = { ProjectAccountDao.class }) public class ProjectAccountDaoImpl extends GenericDaoBase implements ProjectAccountDao { protected final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/projects/dao/ProjectDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectDaoImpl.java index 81e170a1822..9a4c4f159e6 100644 --- a/server/src/com/cloud/projects/dao/ProjectDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectDaoImpl.java @@ -21,6 +21,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.projects.Project; import com.cloud.projects.ProjectVO; @@ -35,6 +36,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.Transaction; +@Component @Local(value = { ProjectDao.class }) public class ProjectDaoImpl extends GenericDaoBase implements ProjectDao { private static final Logger s_logger = Logger.getLogger(ProjectDaoImpl.class); diff --git a/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java index d33e21ad7a3..44915126603 100644 --- a/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.projects.ProjectInvitation.State; import com.cloud.projects.ProjectInvitationVO; @@ -30,6 +31,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value = { ProjectInvitationDao.class }) public class ProjectInvitationDaoImpl extends GenericDaoBase implements ProjectInvitationDao { private static final Logger s_logger = Logger.getLogger(ProjectInvitationDaoImpl.class); diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/com/cloud/resource/DummyHostDiscoverer.java index 87a0ac07776..905fccf9d70 100755 --- a/server/src/com/cloud/resource/DummyHostDiscoverer.java +++ b/server/src/com/cloud/resource/DummyHostDiscoverer.java @@ -26,10 +26,12 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.host.HostVO; import com.cloud.hypervisor.Hypervisor; +@Component @Local(value=Discoverer.class) public class DummyHostDiscoverer implements Discoverer { private static final Logger s_logger = Logger.getLogger(DummyHostDiscoverer.class); diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index ced601b179b..696176863a6 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -31,6 +31,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager.TapAgentsAction; @@ -151,6 +152,7 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local({ ResourceManager.class, ResourceService.class }) public class ResourceManagerImpl implements ResourceManager, ResourceService, Manager { private static final Logger s_logger = Logger.getLogger(ResourceManagerImpl.class); diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index 7f446d747cb..486711aac7b 100755 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -29,6 +29,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.SecurityChecker.AccessType; import com.cloud.alert.AlertManager; @@ -81,6 +82,7 @@ import com.cloud.vm.dao.VMInstanceDao; import edu.emory.mathcs.backport.java.util.Arrays; +@Component @Local(value = { ResourceLimitService.class }) public class ResourceLimitManagerImpl implements ResourceLimitService, Manager { public static final Logger s_logger = Logger.getLogger(ResourceLimitManagerImpl.class); diff --git a/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java b/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java index 69d87743fc7..8fa9e416565 100644 --- a/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java +++ b/server/src/com/cloud/secstorage/CommandExecLogDaoImpl.java @@ -20,11 +20,14 @@ import java.util.Date; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value={CommandExecLogDao.class}) public class CommandExecLogDaoImpl extends GenericDaoBase implements CommandExecLogDao { diff --git a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java index 8fd21fd498d..d06b22d4148 100755 --- a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.api.Command; import com.cloud.configuration.Config; @@ -47,6 +48,7 @@ import com.cloud.vm.SystemVmLoadScanner.AfterScanAction; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.SecondaryStorageVmDao; +@Component @Local(value = { SecondaryStorageVmManager.class }) public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerImpl { private static final Logger s_logger = Logger.getLogger(PremiumSecondaryStorageManagerImpl.class); diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java index ce7cdab72bf..25fa802a957 100644 --- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java +++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java @@ -21,10 +21,13 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + /** * Use this UserAuthenticator if users are already authenticated outside * */ +@Component @Local(value={UserAuthenticator.class}) public abstract class DefaultUserAuthenticator implements UserAuthenticator { private String _name = null; diff --git a/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java index 71ad51f20f4..a43c2b32049 100644 --- a/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java +++ b/server/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.persistence.EntityExistsException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; @@ -31,6 +32,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={ServiceOfferingDao.class}) @DB(txn=false) public class ServiceOfferingDaoImpl extends GenericDaoBase implements ServiceOfferingDao { protected static final Logger s_logger = Logger.getLogger(ServiceOfferingDaoImpl.class); diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java index a399b03dfad..b578169811b 100755 --- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java +++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -49,6 +50,7 @@ import com.cloud.utils.db.SearchCriteria2; import com.cloud.utils.db.SearchCriteriaService; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value ={OCFS2Manager.class}) public class OCFS2ManagerImpl implements OCFS2Manager, ResourceListener { String _name; diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index fc6fb5bfa60..2d96df7aa42 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -45,6 +45,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -212,6 +213,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = { StorageManager.class, StorageService.class }) public class StorageManagerImpl implements StorageManager, Manager, ClusterManagerListener { private static final Logger s_logger = Logger.getLogger(StorageManagerImpl.class); diff --git a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java index 7d33c153297..6b1a9573efc 100644 --- a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java @@ -27,6 +27,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; @@ -44,6 +45,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.utils.component.Inject; +@Component @Local(value=StoragePoolAllocator.class) public class FirstFitStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(FirstFitStoragePoolAllocator.class); diff --git a/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java index 2418583419f..a6d227bd312 100644 --- a/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/GarbageCollectingStoragePoolAllocator.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.deploy.DeploymentPlan; @@ -34,6 +35,7 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=StoragePoolAllocator.class) public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(GarbageCollectingStoragePoolAllocator.class); diff --git a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java index 445f278ba67..41952c2e029 100644 --- a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; @@ -61,6 +62,7 @@ import com.cloud.vm.dao.VMInstanceDao; // Rush to make LocalStoragePoolAllocator use static allocation status, we should revisit the overall // allocation process to make it more reliable in next release. The code put in here is pretty ugly // +@Component @Local(value = StoragePoolAllocator.class) public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(LocalStoragePoolAllocator.class); diff --git a/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java b/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java index f1da114a1fe..711d40f99cf 100644 --- a/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java +++ b/server/src/com/cloud/storage/allocator/UseLocalForRootAllocator.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO; @@ -37,6 +39,7 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +@Component @Local(value=StoragePoolAllocator.class) public class UseLocalForRootAllocator extends LocalStoragePoolAllocator implements StoragePoolAllocator { diff --git a/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java index cd2980ef5d8..1f68c5082ff 100644 --- a/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java +++ b/server/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.persistence.EntityExistsException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.DiskOfferingVO.Type; @@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value={DiskOfferingDao.class}) public class DiskOfferingDaoImpl extends GenericDaoBase implements DiskOfferingDao { private static final Logger s_logger = Logger.getLogger(DiskOfferingDaoImpl.class); diff --git a/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java b/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java index 611694c7560..d017b996d5d 100644 --- a/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java +++ b/server/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java @@ -18,9 +18,12 @@ package com.cloud.storage.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.GuestOSCategoryVO; import com.cloud.utils.db.GenericDaoBase; +@Component @Local (value={GuestOSCategoryDao.class}) public class GuestOSCategoryDaoImpl extends GenericDaoBase implements GuestOSCategoryDao { diff --git a/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java b/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java index 251deb56b32..c39fae8ea8d 100755 --- a/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java +++ b/server/src/com/cloud/storage/dao/GuestOSDaoImpl.java @@ -20,12 +20,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.GuestOSVO; import com.cloud.storage.VMTemplateHostVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local (value={GuestOSDao.class}) public class GuestOSDaoImpl extends GenericDaoBase implements GuestOSDao { diff --git a/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java index 2ae394e4a5c..286b1d9ce3f 100644 --- a/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java +++ b/server/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.storage.LaunchPermissionVO; import com.cloud.storage.VMTemplateVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={LaunchPermissionDao.class}) public class LaunchPermissionDaoImpl extends GenericDaoBase implements LaunchPermissionDao { private static final Logger s_logger = Logger.getLogger(LaunchPermissionDaoImpl.class); diff --git a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java index 65e2f5f1d76..30569a0d4fa 100644 --- a/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java +++ b/server/src/com/cloud/storage/dao/SnapshotDaoImpl.java @@ -23,6 +23,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.storage.Snapshot; @@ -44,6 +45,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.VMInstanceDaoImpl; +@Component @Local (value={SnapshotDao.class}) public class SnapshotDaoImpl extends GenericDaoBase implements SnapshotDao { public static final Logger s_logger = Logger.getLogger(SnapshotDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java index 10eaaea7f41..9beed6706de 100644 --- a/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java +++ b/server/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.SnapshotPolicyVO; import com.cloud.utils.DateUtil.IntervalType; import com.cloud.utils.db.Filter; @@ -28,6 +30,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local (value={SnapshotPolicyDao.class}) public class SnapshotPolicyDaoImpl extends GenericDaoBase implements SnapshotPolicyDao { private final SearchBuilder VolumeIdSearch; diff --git a/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java b/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java index c4e6a5af89a..c01644e0918 100644 --- a/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java +++ b/server/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java @@ -21,13 +21,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.Snapshot; import com.cloud.storage.SnapshotScheduleVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; - +@Component @Local (value={SnapshotScheduleDao.class}) public class SnapshotScheduleDaoImpl extends GenericDaoBase implements SnapshotScheduleDao { protected final SearchBuilder executableSchedulesSearch; diff --git a/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java index 730610b763b..35736491ea8 100644 --- a/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java +++ b/server/src/com/cloud/storage/dao/StoragePoolDaoImpl.java @@ -27,6 +27,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.host.Status; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StoragePoolDetailVO; @@ -43,6 +45,7 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={StoragePoolDao.class}) @DB(txn=false) public class StoragePoolDaoImpl extends GenericDaoBase implements StoragePoolDao { protected final SearchBuilder AllFieldSearch; diff --git a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java index ff74b4d1f92..8cc5d7be9d4 100644 --- a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java +++ b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java @@ -22,12 +22,15 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.StoragePoolDetailVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value=StoragePoolDetailsDao.class) public class StoragePoolDetailsDaoImpl extends GenericDaoBase implements StoragePoolDetailsDao { diff --git a/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java index b44f8a65169..4f509d14041 100644 --- a/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java +++ b/server/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.host.Status; import com.cloud.storage.StoragePoolHostVO; @@ -34,6 +35,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value = { StoragePoolHostDao.class }) public class StoragePoolHostDaoImpl extends GenericDaoBase implements StoragePoolHostDao { public static final Logger s_logger = Logger.getLogger(StoragePoolHostDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java index 47a21452c1b..360a814f59a 100644 --- a/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java +++ b/server/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java @@ -24,6 +24,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.StoragePoolWorkVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @@ -32,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={StoragePoolWorkDao.class}) @DB(txn=false) public class StoragePoolWorkDaoImpl extends GenericDaoBase implements StoragePoolWorkDao { diff --git a/server/src/com/cloud/storage/dao/SwiftDaoImpl.java b/server/src/com/cloud/storage/dao/SwiftDaoImpl.java index 2758170d412..19e5a85142a 100644 --- a/server/src/com/cloud/storage/dao/SwiftDaoImpl.java +++ b/server/src/com/cloud/storage/dao/SwiftDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.api.to.SwiftTO; import com.cloud.storage.SwiftVO; @@ -31,7 +32,7 @@ import com.cloud.utils.db.GenericDaoBase; * * */ - +@Component @Local (value={SwiftDao.class}) public class SwiftDaoImpl extends GenericDaoBase implements SwiftDao { public static final Logger s_logger = Logger.getLogger(SwiftDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/UploadDaoImpl.java b/server/src/com/cloud/storage/dao/UploadDaoImpl.java index 53ff3aed9c3..31fad43e257 100755 --- a/server/src/com/cloud/storage/dao/UploadDaoImpl.java +++ b/server/src/com/cloud/storage/dao/UploadDaoImpl.java @@ -19,6 +19,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.storage.UploadVO; import com.cloud.storage.Upload.Status; @@ -27,6 +28,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={UploadDao.class}) public class UploadDaoImpl extends GenericDaoBase implements UploadDao { public static final Logger s_logger = Logger.getLogger(UploadDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 2a0dfc85559..80f2ca43f1e 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -31,6 +31,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.BaseCmd; import com.cloud.configuration.dao.ConfigurationDao; @@ -67,6 +68,7 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value={VMTemplateDao.class}) public class VMTemplateDaoImpl extends GenericDaoBase implements VMTemplateDao { private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class); diff --git a/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java index 885fe37d9ed..e066dff3840 100644 --- a/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java @@ -22,12 +22,15 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.storage.VMTemplateDetailVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value=VMTemplateDetailsDao.class) public class VMTemplateDetailsDaoImpl extends GenericDaoBase implements VMTemplateDetailsDao { diff --git a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java index 943aa66b0b5..8f9a44922e2 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java @@ -29,6 +29,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.host.Host; import com.cloud.host.HostVO; @@ -43,6 +44,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={VMTemplateHostDao.class}) public class VMTemplateHostDaoImpl extends GenericDaoBase implements VMTemplateHostDao { public static final Logger s_logger = Logger.getLogger(VMTemplateHostDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java index 4138ca10c29..292bd5bf9d2 100644 --- a/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.storage.VMTemplateStoragePoolVO; import com.cloud.storage.VMTemplateStorageResourceAssoc; @@ -34,6 +35,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={VMTemplatePoolDao.class}) public class VMTemplatePoolDaoImpl extends GenericDaoBase implements VMTemplatePoolDao { public static final Logger s_logger = Logger.getLogger(VMTemplatePoolDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java index 14da824b6ca..c65527af202 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateSwiftDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.storage.VMTemplateSwiftVO; import com.cloud.utils.db.GenericDaoBase; @@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria; * */ +@Component @Local(value = { VMTemplateSwiftDao.class }) public class VMTemplateSwiftDaoImpl extends GenericDaoBase implements VMTemplateSwiftDao { public static final Logger s_logger = Logger.getLogger(VMTemplateSwiftDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java index 38c04d5a387..916e0aceb2c 100644 --- a/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java @@ -21,12 +21,14 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.storage.VMTemplateZoneVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={VMTemplateZoneDao.class}) public class VMTemplateZoneDaoImpl extends GenericDaoBase implements VMTemplateZoneDao { public static final Logger s_logger = Logger.getLogger(VMTemplateZoneDaoImpl.class.getName()); diff --git a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java index 638d209e5b1..37f8fcf0738 100755 --- a/server/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -26,6 +26,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.server.ResourceTag.TaggedResourceType; @@ -49,6 +50,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value=VolumeDao.class) public class VolumeDaoImpl extends GenericDaoBase implements VolumeDao { private static final Logger s_logger = Logger.getLogger(VolumeDaoImpl.class); diff --git a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java index 389f8c0ea93..66e1a717f15 100755 --- a/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java @@ -16,17 +16,20 @@ // under the License. package com.cloud.storage.dao; - import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.host.HostVO; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VolumeHostVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; + +@Component @Local(value={VolumeHostDao.class}) public class VolumeHostDaoImpl extends GenericDaoBase implements VolumeHostDao { diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index 27367779650..d8888597b24 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -107,6 +108,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; import edu.emory.mathcs.backport.java.util.Collections; +@Component @Local(value={DownloadMonitor.class}) public class DownloadMonitorImpl implements DownloadMonitor { static final Logger s_logger = Logger.getLogger(DownloadMonitorImpl.class); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java index 65213fbddb8..92edb4d274d 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java @@ -30,6 +30,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.configuration.dao.ConfigurationDao; @@ -57,6 +58,7 @@ import com.cloud.utils.script.Script; * storage servers and make sure everything it can do is * correct. */ +@Component @Local(value=Discoverer.class) public class SecondaryStorageDiscoverer extends DiscovererBase implements Discoverer { private static final Logger s_logger = Logger.getLogger(SecondaryStorageDiscoverer.class); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 7a94001c405..4b98915689c 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -30,6 +30,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -156,6 +157,7 @@ import com.cloud.vm.dao.VMInstanceDao; // Starting, HA, Migrating, Creating and Running state are all counted as "Open" for available capacity calculation // because sooner or later, it will be driven into Running state // +@Component @Local(value = { SecondaryStorageVmManager.class }) public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(SecondaryStorageManagerImpl.class); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java index 707bc41587e..635f6648240 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java @@ -23,8 +23,11 @@ import java.util.Random; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.vm.SecondaryStorageVmVO; +@Component @Local(value={SecondaryStorageVmAllocator.class}) public class SecondaryStorageVmDefaultAllocator implements SecondaryStorageVmAllocator { diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index d89a6d97678..5802a8085d3 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -26,6 +26,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -124,6 +125,7 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmDao; +@Component @Local(value = { SnapshotManager.class, SnapshotService.class }) public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Manager { private static final Logger s_logger = Logger.getLogger(SnapshotManagerImpl.class); diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index 8c099940b52..97491cd7aec 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -27,6 +27,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.ApiDispatcher; import com.cloud.api.ApiGsonHelper; @@ -60,6 +61,7 @@ import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={SnapshotScheduler.class}) public class SnapshotSchedulerImpl implements SnapshotScheduler { private static final Logger s_logger = Logger.getLogger(SnapshotSchedulerImpl.class); diff --git a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java index 893246940eb..703ee8faf99 100644 --- a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java +++ b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java @@ -26,6 +26,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -60,6 +61,7 @@ import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = { SwiftManager.class }) public class SwiftManagerImpl implements SwiftManager { private static final Logger s_logger = Logger.getLogger(SwiftManagerImpl.class); diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java index 4231be81ff6..470d8cb5c86 100755 --- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java +++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java @@ -32,6 +32,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -75,6 +76,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; /** * Monitors the progress of upload. */ +@Component @Local(value={UploadMonitor.class}) public class UploadMonitorImpl implements UploadMonitor { diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index db32f2cd41f..d148a08fd89 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.commands.ListTagsCmd; import com.cloud.domain.Domain; @@ -70,6 +71,7 @@ import com.cloud.uuididentity.dao.IdentityDao; import com.cloud.vm.dao.UserVmDao; +@Component @Local(value = { TaggedResourceService.class}) public class TaggedResourceManagerImpl implements TaggedResourceService, Manager{ public static final Logger s_logger = Logger.getLogger(TaggedResourceManagerImpl.class); diff --git a/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java b/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java index 960e03e7861..2eb729f37dc 100644 --- a/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java +++ b/server/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java @@ -18,6 +18,9 @@ package com.cloud.tags.dao; import java.util.List; import javax.ejb.Local; + +import org.springframework.stereotype.Component; + import com.cloud.server.ResourceTag; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.tags.ResourceTagVO; @@ -26,7 +29,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; - +@Component @Local(value = { ResourceTagDao.class }) public class ResourceTagsDaoImpl extends GenericDaoBase implements ResourceTagDao{ final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java index 24f6aeb07e3..e085d93308e 100755 --- a/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -24,6 +24,7 @@ import java.sql.SQLException; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.maint.Version; import com.cloud.upgrade.dao.VersionDao; @@ -34,6 +35,7 @@ import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = {SystemIntegrityChecker.class}) public class DatabaseIntegrityChecker implements SystemIntegrityChecker { private final Logger s_logger = Logger.getLogger(DatabaseIntegrityChecker.class); diff --git a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java index 067f092dbac..193214b1608 100755 --- a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java @@ -18,6 +18,8 @@ package com.cloud.upgrade; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.upgrade.dao.DbUpgrade; import com.cloud.upgrade.dao.Upgrade217to218; import com.cloud.upgrade.dao.Upgrade218to224DomainVlans; @@ -43,6 +45,7 @@ import com.cloud.upgrade.dao.VersionDaoImpl; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.SystemIntegrityChecker; +@Component @Local(value = { SystemIntegrityChecker.class }) public class PremiumDatabaseUpgradeChecker extends DatabaseUpgradeChecker { public PremiumDatabaseUpgradeChecker() { diff --git a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java index 6b5f656fc92..5e6e7bc75b8 100644 --- a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java +++ b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.upgrade.dao.VersionVO.Step; import com.cloud.utils.db.DB; @@ -37,6 +38,7 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = VersionDao.class) @DB(txn = false) public class VersionDaoImpl extends GenericDaoBase implements VersionDao { diff --git a/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java b/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java index b6a8f17d8b2..bbce5f8cae4 100644 --- a/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java +++ b/server/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.usage.ExternalPublicIpStatisticsVO; import com.cloud.user.UserStatisticsVO; import com.cloud.utils.db.GenericDaoBase; @@ -27,6 +29,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.dao.DomainRouterDao; +@Component @Local(value = { ExternalPublicIpStatisticsDao.class }) public class ExternalPublicIpStatisticsDaoImpl extends GenericDaoBase implements ExternalPublicIpStatisticsDao { diff --git a/server/src/com/cloud/usage/dao/UsageDaoImpl.java b/server/src/com/cloud/usage/dao/UsageDaoImpl.java index 3505fdd4912..f9ae70c1f20 100644 --- a/server/src/com/cloud/usage/dao/UsageDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.exception.UsageServerException; import com.cloud.usage.UsageVO; @@ -38,6 +39,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageDao.class}) public class UsageDaoImpl extends GenericDaoBase implements UsageDao { public static final Logger s_logger = Logger.getLogger(UsageDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java b/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java index 78ba4d877c3..9af4a267097 100644 --- a/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java @@ -26,6 +26,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageIPAddressVO; import com.cloud.user.Account; @@ -33,6 +34,7 @@ import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageIPAddressDao.class}) public class UsageIPAddressDaoImpl extends GenericDaoBase implements UsageIPAddressDao { public static final Logger s_logger = Logger.getLogger(UsageIPAddressDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java b/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java index d3a338a8241..3c7a3dc110d 100644 --- a/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageJobDaoImpl.java @@ -24,6 +24,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.exception.UsageServerException; import com.cloud.usage.UsageJobVO; @@ -32,6 +33,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageJobDao.class}) public class UsageJobDaoImpl extends GenericDaoBase implements UsageJobDao { private static final Logger s_logger = Logger.getLogger(UsageJobDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java b/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java index 07d0e6f36c8..fa632236b79 100644 --- a/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageLoadBalancerPolicyVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageLoadBalancerPolicyDao.class}) public class UsageLoadBalancerPolicyDaoImpl extends GenericDaoBase implements UsageLoadBalancerPolicyDao { public static final Logger s_logger = Logger.getLogger(UsageLoadBalancerPolicyDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java b/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java index 2a9ecefacb3..d64fd807890 100644 --- a/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java @@ -24,11 +24,13 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageNetworkVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageNetworkDao.class}) public class UsageNetworkDaoImpl extends GenericDaoBase implements UsageNetworkDao { private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index 722a548490b..a6539dd6ebb 100644 --- a/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageNetworkOfferingVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageNetworkOfferingDao.class}) public class UsageNetworkOfferingDaoImpl extends GenericDaoBase implements UsageNetworkOfferingDao { public static final Logger s_logger = Logger.getLogger(UsageNetworkOfferingDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java b/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java index 5c5e49e1891..2afc50aa475 100644 --- a/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsagePortForwardingRuleVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsagePortForwardingRuleDao.class}) public class UsagePortForwardingRuleDaoImpl extends GenericDaoBase implements UsagePortForwardingRuleDao { public static final Logger s_logger = Logger.getLogger(UsagePortForwardingRuleDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java b/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java index 4ec2131c09e..7564bf0e2a8 100644 --- a/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageSecurityGroupVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageSecurityGroupDao.class}) public class UsageSecurityGroupDaoImpl extends GenericDaoBase implements UsageSecurityGroupDao { public static final Logger s_logger = Logger.getLogger(UsageSecurityGroupDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java index b797890fcb0..297c8f4c7e9 100644 --- a/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageStorageDaoImpl.java @@ -26,6 +26,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageStorageVO; import com.cloud.utils.DateUtil; @@ -34,6 +35,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageStorageDao.class}) public class UsageStorageDaoImpl extends GenericDaoBase implements UsageStorageDao { public static final Logger s_logger = Logger.getLogger(UsageStorageDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java b/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java index 66ae750d1bd..fc827548781 100644 --- a/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageVMInstanceVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageVMInstanceDao.class}) public class UsageVMInstanceDaoImpl extends GenericDaoBase implements UsageVMInstanceDao { public static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java b/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java index 8ae277a2b11..d6bf13b41bf 100644 --- a/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageVPNUserVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageVPNUserDao.class}) public class UsageVPNUserDaoImpl extends GenericDaoBase implements UsageVPNUserDao { public static final Logger s_logger = Logger.getLogger(UsageVPNUserDaoImpl.class.getName()); diff --git a/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java b/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java index c8831d9aa84..039d8f4be90 100644 --- a/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java @@ -26,12 +26,14 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.usage.UsageVolumeVO; import com.cloud.utils.DateUtil; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={UsageVolumeDao.class}) public class UsageVolumeDaoImpl extends GenericDaoBase implements UsageVolumeDao { public static final Logger s_logger = Logger.getLogger(UsageVolumeDaoImpl.class.getName()); diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 3fd0e17886e..c31c6f80c6d 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -38,6 +38,7 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.ControlledEntity; import com.cloud.acl.SecurityChecker; @@ -142,6 +143,7 @@ import com.cloud.vm.dao.InstanceGroupDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = { AccountManager.class, AccountService.class }) public class AccountManagerImpl implements AccountManager, AccountService, Manager { public static final Logger s_logger = Logger.getLogger(AccountManagerImpl.class); diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java index 8905be0b722..598f732e11e 100644 --- a/server/src/com/cloud/user/DomainManagerImpl.java +++ b/server/src/com/cloud/user/DomainManagerImpl.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.commands.ListDomainChildrenCmd; import com.cloud.api.commands.ListDomainsCmd; @@ -57,6 +58,7 @@ import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; +@Component @Local(value = { DomainManager.class, DomainService.class }) public class DomainManagerImpl implements DomainManager, DomainService, Manager { public static final Logger s_logger = Logger.getLogger(DomainManagerImpl.class); diff --git a/server/src/com/cloud/user/dao/AccountDaoImpl.java b/server/src/com/cloud/user/dao/AccountDaoImpl.java index 7300bb1af0c..ae102a3d446 100755 --- a/server/src/com/cloud/user/dao/AccountDaoImpl.java +++ b/server/src/com/cloud/user/dao/AccountDaoImpl.java @@ -24,6 +24,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.user.Account; import com.cloud.user.Account.State; @@ -38,6 +39,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={AccountDao.class}) public class AccountDaoImpl extends GenericDaoBase implements AccountDao { private static final Logger s_logger = Logger.getLogger(AccountDaoImpl.class); diff --git a/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java b/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java index ac16cc9c01e..fbed8bf1ff2 100644 --- a/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java +++ b/server/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java @@ -20,10 +20,13 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.SSHKeyPairVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={SSHKeyPairDao.class}) public class SSHKeyPairDaoImpl extends GenericDaoBase implements SSHKeyPairDao { diff --git a/server/src/com/cloud/user/dao/UserAccountDaoImpl.java b/server/src/com/cloud/user/dao/UserAccountDaoImpl.java index 663e58fba4f..9edfe4aa310 100644 --- a/server/src/com/cloud/user/dao/UserAccountDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserAccountDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.user.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.UserAccount; import com.cloud.user.UserAccountVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={UserAccountDao.class}) public class UserAccountDaoImpl extends GenericDaoBase implements UserAccountDao { diff --git a/server/src/com/cloud/user/dao/UserDaoImpl.java b/server/src/com/cloud/user/dao/UserDaoImpl.java index fefbb8a92ec..2f318a3aee6 100644 --- a/server/src/com/cloud/user/dao/UserDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.UserVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; +@Component @Local(value={UserDao.class}) public class UserDaoImpl extends GenericDaoBase implements UserDao { protected SearchBuilder UsernamePasswordSearch; diff --git a/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java b/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java index fd7795a9008..913ec070dfa 100644 --- a/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserStatisticsDaoImpl.java @@ -26,6 +26,7 @@ import java.util.TimeZone; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.user.UserStatisticsVO; import com.cloud.utils.DateUtil; @@ -34,6 +35,7 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; +@Component @Local(value={UserStatisticsDao.class}) public class UserStatisticsDaoImpl extends GenericDaoBase implements UserStatisticsDao { private static final Logger s_logger = Logger.getLogger(UserStatisticsDaoImpl.class); diff --git a/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java b/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java index 7275142e5ea..c4dfe662e6b 100644 --- a/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java +++ b/server/src/com/cloud/user/dao/UserStatsLogDaoImpl.java @@ -18,9 +18,12 @@ package com.cloud.user.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.user.UserStatsLogVO; import com.cloud.utils.db.GenericDaoBase; +@Component @Local(value={UserStatsLogDao.class}) public class UserStatsLogDaoImpl extends GenericDaoBase implements UserStatsLogDao { public UserStatsLogDaoImpl(){ diff --git a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java index 6ec3f253fd6..9eef34eb90d 100644 --- a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java +++ b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java @@ -21,12 +21,15 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.api.IdentityMapper; import com.cloud.api.IdentityService; import com.cloud.utils.component.Inject; import com.cloud.utils.component.Manager; import com.cloud.uuididentity.dao.IdentityDao; +@Component @Local(value = { IdentityService.class }) public class IdentityServiceImpl implements Manager, IdentityService { private String _name; diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java index ce0ca1307fc..f35b57c2b67 100644 --- a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java +++ b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java @@ -26,6 +26,7 @@ import java.util.UUID; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.IdentityMapper; import com.cloud.exception.InvalidParameterValueException; @@ -35,6 +36,7 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.Transaction; +@Component @Local(value={IdentityDao.class}) public class IdentityDaoImpl extends GenericDaoBase implements IdentityDao { private static final Logger s_logger = Logger.getLogger(IdentityDaoImpl.class); diff --git a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java index dc51eab4fc7..20deaf12068 100644 --- a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java @@ -22,9 +22,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.springframework.stereotype.Component; + import com.cloud.cluster.ClusterManagerListener; import com.cloud.cluster.ManagementServerHostVO; +@Component @Local(value=VirtualMachineManager.class) public class ClusteredVirtualMachineManagerImpl extends VirtualMachineManagerImpl implements ClusterManagerListener { diff --git a/server/src/com/cloud/vm/ItWorkDaoImpl.java b/server/src/com/cloud/vm/ItWorkDaoImpl.java index 6f63eb334ab..3a849f81b42 100644 --- a/server/src/com/cloud/vm/ItWorkDaoImpl.java +++ b/server/src/com/cloud/vm/ItWorkDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -28,6 +30,7 @@ import com.cloud.utils.time.InaccurateClock; import com.cloud.vm.ItWorkVO.Step; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value=ItWorkDao.class) public class ItWorkDaoImpl extends GenericDaoBase implements ItWorkDao { protected final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index dbcbeb8bfa2..ccbcf828264 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -33,6 +33,7 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.acl.ControlledEntity.ACLType; import com.cloud.agent.AgentManager; @@ -234,6 +235,7 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = { UserVmManager.class, UserVmService.class }) public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager { private static final Logger s_logger = Logger.getLogger(UserVmManagerImpl.class); diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 9230f4ae729..ac423ee89fc 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -37,6 +37,7 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager.OnError; @@ -160,6 +161,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; +@Component @Local(value = VirtualMachineManager.class) public class VirtualMachineManagerImpl implements VirtualMachineManager, Listener { private static final Logger s_logger = Logger.getLogger(VirtualMachineManagerImpl.class); diff --git a/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java index e0d113d3be5..988b68f7545 100644 --- a/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java +++ b/server/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java @@ -26,6 +26,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.info.ConsoleProxyLoadInfo; import com.cloud.utils.Pair; @@ -38,6 +39,7 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value={ConsoleProxyDao.class}) public class ConsoleProxyDaoImpl extends GenericDaoBase implements ConsoleProxyDao { private static final Logger s_logger = Logger.getLogger(ConsoleProxyDaoImpl.class); diff --git a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index 175d3f28d04..d63c5b4446d 100755 --- a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.host.HostVO; import com.cloud.host.dao.HostDaoImpl; import com.cloud.network.Network; @@ -43,6 +45,7 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value = { DomainRouterDao.class }) public class DomainRouterDaoImpl extends GenericDaoBase implements DomainRouterDao { diff --git a/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java b/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java index ff31c0adfaf..0ce127eea35 100644 --- a/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java +++ b/server/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.InstanceGroupVO; +@Component @Local (value={InstanceGroupDao.class}) public class InstanceGroupDaoImpl extends GenericDaoBase implements InstanceGroupDao{ private SearchBuilder AccountIdNameSearch; diff --git a/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java b/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java index 4c7448b670a..a33cc847dca 100644 --- a/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java +++ b/server/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java @@ -20,11 +20,14 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.InstanceGroupVMMapVO; +@Component @Local(value={InstanceGroupVMMapDao.class}) public class InstanceGroupVMMapDaoImpl extends GenericDaoBase implements InstanceGroupVMMapDao{ diff --git a/server/src/com/cloud/vm/dao/NicDaoImpl.java b/server/src/com/cloud/vm/dao/NicDaoImpl.java index 3cd7fa6b488..e09b0abff51 100644 --- a/server/src/com/cloud/vm/dao/NicDaoImpl.java +++ b/server/src/com/cloud/vm/dao/NicDaoImpl.java @@ -20,6 +20,8 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; @@ -31,6 +33,7 @@ import com.cloud.vm.Nic.State; import com.cloud.vm.NicVO; import com.cloud.vm.VirtualMachine; +@Component @Local(value=NicDao.class) public class NicDaoImpl extends GenericDaoBase implements NicDao { private final SearchBuilder AllFieldsSearch; diff --git a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java index 573f27d9317..dedf0774b4b 100644 --- a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java +++ b/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java @@ -20,7 +20,9 @@ package com.cloud.vm.dao; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; +@Component @Local(value = { UserVmDao.class }) public class RandomlyIncreasingVMInstanceDaoImpl extends UserVmDaoImpl { diff --git a/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java index 357702772e7..6847566c43b 100644 --- a/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.utils.db.Attribute; import com.cloud.utils.db.GenericDaoBase; @@ -36,6 +37,7 @@ import com.cloud.vm.SecondaryStorageVm; import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VirtualMachine.State; +@Component @Local(value={SecondaryStorageVmDao.class}) public class SecondaryStorageVmDaoImpl extends GenericDaoBase implements SecondaryStorageVmDao { private static final Logger s_logger = Logger.getLogger(SecondaryStorageVmDaoImpl.class); diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java index db1d8776623..ebe67bef7eb 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -29,6 +29,7 @@ import java.util.Map; import javax.ejb.Local; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.configuration.Resource; import com.cloud.server.ResourceTag.TaggedResourceType; @@ -52,6 +53,7 @@ import com.cloud.vm.dao.UserVmData.NicData; import com.cloud.vm.dao.UserVmData.SecurityGroupData; +@Component @Local(value={UserVmDao.class}) public class UserVmDaoImpl extends GenericDaoBase implements UserVmDao { public static final Logger s_logger = Logger.getLogger(UserVmDaoImpl.class); diff --git a/server/src/com/cloud/vm/dao/UserVmDetailsDao.java b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java index bdccec94ef0..87fb9b6482b 100644 --- a/server/src/com/cloud/vm/dao/UserVmDetailsDao.java +++ b/server/src/com/cloud/vm/dao/UserVmDetailsDao.java @@ -18,9 +18,12 @@ package com.cloud.vm.dao; import java.util.Map; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDao; import com.cloud.vm.UserVmDetailVO; +@Component public interface UserVmDetailsDao extends GenericDao { Map findDetails(long vmId); diff --git a/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index b74741b6818..93c481ead5d 100644 --- a/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -22,12 +22,15 @@ import java.util.Map; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.vm.UserVmDetailVO; +@Component @Local(value=UserVmDetailsDao.class) public class UserVmDetailsDaoImpl extends GenericDaoBase implements UserVmDetailsDao { protected final SearchBuilder VmSearch; diff --git a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java index 571b5d1841c..c1b6335f8fa 100644 --- a/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java +++ b/server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java @@ -27,10 +27,13 @@ import java.util.List; import java.util.Map; import javax.ejb.Local; +import javax.inject.Inject; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDaoImpl; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.tags.dao.ResourceTagsDaoImpl; @@ -56,6 +59,7 @@ import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.Type; +@Component @Local(value = { VMInstanceDao.class }) public class VMInstanceDaoImpl extends GenericDaoBase implements VMInstanceDao { @@ -80,9 +84,13 @@ public class VMInstanceDaoImpl extends GenericDaoBase implem protected SearchBuilder NetworkTypeSearch; protected GenericSearchBuilder DistinctHostNameSearch; +/* ResourceTagsDaoImpl _tagsDao = ComponentLocator.inject(ResourceTagsDaoImpl.class); NicDao _nicDao = ComponentLocator.inject(NicDaoImpl.class); - +*/ + @Inject ResourceTagsDaoImpl _tagsDao; + @Inject NicDao _nicDao; + protected final Attribute _updateTimeAttr; private static final String ORDER_CLUSTERS_NUMBER_OF_VMS_FOR_ACCOUNT_PART1 = @@ -98,7 +106,10 @@ public class VMInstanceDaoImpl extends GenericDaoBase implem " AND host.pod_id = ? AND host.cluster_id = ? AND host.type = 'Routing' " + " GROUP BY host.id ORDER BY 2 ASC "; +/* protected final HostDaoImpl _hostDao = ComponentLocator.inject(HostDaoImpl.class); + */ + @Inject protected HostDao _hostDao; protected VMInstanceDaoImpl() {