incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [7/11] git commit: Add Spring annotation to major components
Date Wed, 07 Nov 2012 23:03:47 GMT
Add Spring annotation to major components


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aab02e27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aab02e27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aab02e27

Branch: refs/heads/javelin
Commit: aab02e27436dde87d66013f10c19bf0a9e54e11c
Parents: 17c82b7
Author: Kelven Yang <kelveny@gmail.com>
Authored: Thu Nov 1 10:36:33 2012 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Wed Nov 7 14:53:39 2012 -0800

----------------------------------------------------------------------
 .../bridge/persist/dao/BucketPolicyDaoImpl.java    |    3 +++
 .../persist/dao/CloudStackAccountDaoImpl.java      |    3 +++
 .../dao/CloudStackConfigurationDaoImpl.java        |    3 ++-
 .../persist/dao/CloudStackSvcOfferingDaoImpl.java  |    2 ++
 .../com/cloud/bridge/persist/dao/MHostDaoImpl.java |    3 +++
 .../bridge/persist/dao/MHostMountDaoImpl.java      |    3 +++
 .../bridge/persist/dao/MultiPartPartsDaoImpl.java  |    3 +++
 .../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 ++
 .../src/com/cloud/event/dao/UsageEventDaoImpl.java |    2 ++
 .../cloud/deploy/UserConcentratedPodPlanner.java   |    2 ++
 .../com/cloud/deploy/UserDispersingPlanner.java    |    2 ++
 .../src/com/cloud/netapp/NetappManagerImpl.java    |    2 ++
 .../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 +
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java    |    2 ++
 .../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 +++
 .../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 ++
 .../network/element/CiscoNexusVSMElement.java      |    2 ++
 .../xen/src/com/cloud/ha/XenServerFencer.java      |    2 ++
 .../src/com/cloud/hypervisor/XenServerGuru.java    |    3 +++
 .../xen/discoverer/XcpServerDiscoverer.java        |    2 ++
 .../element/ElasticLoadBalancerElement.java        |    3 ++-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |    2 ++
 .../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 +++
 .../cloud/network/element/NetscalerElement.java    |    2 ++
 .../com/cloud/network/dao/NiciraNvpDaoImpl.java    |    3 +++
 .../network/dao/NiciraNvpNicMappingDaoImpl.java    |    3 +++
 .../cloud/network/element/NiciraNvpElement.java    |    2 ++
 .../src/com/cloud/network/element/OvsElement.java  |    3 +++
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |    2 ++
 .../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 ++
 .../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 ++
 .../src/com/cloud/alert/ClusterAlertAdapter.java   |    2 ++
 .../com/cloud/alert/ConsoleProxyAlertAdapter.java  |    2 ++
 .../alert/SecondaryStorageVmAlertAdapter.java      |    2 ++
 server/src/com/cloud/alert/dao/AlertDaoImpl.java   |    3 +++
 .../cloud/async/AsyncJobExecutorContextImpl.java   |    3 +++
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |    2 ++
 .../src/com/cloud/async/SyncQueueManagerImpl.java  |    2 ++
 .../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 +++
 .../com/cloud/capacity/CapacityManagerImpl.java    |    2 ++
 .../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 ++
 .../cluster/ClusterServiceServletAdapter.java      |    2 ++
 .../com/cloud/cluster/DummyClusterManagerImpl.java |    2 ++
 .../com/cloud/cluster/ManagementServerNode.java    |    3 +++
 .../ClusterBasedAgentLoadBalancerPlanner.java      |    3 ++-
 .../agentlb/dao/HostTransferMapDaoImpl.java        |    2 ++
 .../cluster/dao/ManagementServerHostDaoImpl.java   |    2 ++
 .../dao/ManagementServerHostPeerDaoImpl.java       |    2 ++
 .../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 +++
 .../AgentBasedConsoleProxyManager.java             |    2 ++
 .../AgentBasedStandaloneConsoleProxyManager.java   |    2 ++
 .../consoleproxy/ConsoleProxyBalanceAllocator.java |    3 +++
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    2 ++
 .../consoleproxy/StaticConsoleProxyManager.java    |    3 +++
 server/src/com/cloud/dao/EntityManagerImpl.java    |    3 +++
 server/src/com/cloud/dc/ClusterDetailsDaoImpl.java |    3 +++
 .../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 ++
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |    2 ++
 .../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 ++
 .../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 ++
 .../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 +++
 .../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 ++-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |    3 +++
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |    2 ++
 .../dao/InlineLoadBalancerNicMapDaoImpl.java       |    3 +++
 .../network/dao/LBStickinessPolicyDaoImpl.java     |    5 +++--
 .../com/cloud/network/dao/LoadBalancerDaoImpl.java |    2 ++
 .../network/dao/LoadBalancerVMMapDaoImpl.java      |    3 +++
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |    3 +++
 .../cloud/network/dao/NetworkDomainDaoImpl.java    |    3 +++
 .../dao/NetworkExternalFirewallDaoImpl.java        |    3 +++
 .../dao/NetworkExternalLoadBalancerDaoImpl.java    |    3 +++
 .../com/cloud/network/dao/NetworkOpDaoImpl.java    |    4 +++-
 .../network/dao/NetworkRuleConfigDaoImpl.java      |    3 +++
 .../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 ++
 .../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 +++
 .../cloud/network/element/BareMetalElement.java    |    2 ++
 .../network/element/CloudZonesNetworkElement.java  |    2 ++
 .../cloud/network/element/ExternalDhcpElement.java |    2 ++
 .../network/element/SecurityGroupElement.java      |    3 +++
 .../network/element/VirtualRouterElement.java      |    2 ++
 .../network/element/VpcVirtualRouterElement.java   |    3 +++
 .../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 ++
 .../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 ++
 .../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 ++
 .../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 ++
 .../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 ++
 .../com/cloud/resource/DummyHostDiscoverer.java    |    2 ++
 .../com/cloud/resource/ResourceManagerImpl.java    |    2 ++
 .../resourcelimit/ResourceLimitManagerImpl.java    |    2 ++
 .../cloud/secstorage/CommandExecLogDaoImpl.java    |    3 +++
 .../PremiumSecondaryStorageManagerImpl.java        |    2 ++
 .../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 ++
 .../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 ++-
 .../src/com/cloud/storage/dao/UploadDaoImpl.java   |    2 ++
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |    2 ++
 .../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 ++
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |    2 ++
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |    5 ++++-
 .../storage/download/DownloadMonitorImpl.java      |    2 ++
 .../secondary/SecondaryStorageDiscoverer.java      |    2 ++
 .../secondary/SecondaryStorageManagerImpl.java     |    2 ++
 .../SecondaryStorageVmDefaultAllocator.java        |    3 +++
 .../storage/snapshot/SnapshotManagerImpl.java      |    2 ++
 .../storage/snapshot/SnapshotSchedulerImpl.java    |    2 ++
 .../com/cloud/storage/swift/SwiftManagerImpl.java  |    2 ++
 .../cloud/storage/upload/UploadMonitorImpl.java    |    2 ++
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    2 ++
 .../com/cloud/tags/dao/ResourceTagsDaoImpl.java    |    5 ++++-
 .../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 ++
 .../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 ++
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |    2 ++
 .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java   |    2 ++
 .../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 ++
 .../com/cloud/user/dao/UserStatsLogDaoImpl.java    |    3 +++
 .../cloud/uuididentity/IdentityServiceImpl.java    |    3 +++
 .../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 ++
 .../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 +++
 .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java    |    3 +++
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |    3 +++
 .../dao/RandomlyIncreasingVMInstanceDaoImpl.java   |    2 ++
 .../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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/BucketPolicyDaoImpl.java
index 41bf311..ce230c3 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<BucketPolicyVO, Long> implements BucketPolicyDao{
     public static final Logger logger = Logger.getLogger(BucketPolicyDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackAccountDaoImpl.java
index bca12f6..8fbc7c8 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<CloudStackAccountVO, String> implements CloudStackAccountDao {
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 6333042..511cfa7 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<CloudStackConfigurationVO, String> implements CloudStackConfigurationDao {
 	private static final Logger s_logger = Logger.getLogger(CloudStackConfigurationDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index dca3891..8cca13e 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<CloudStackServiceOfferingVO, String> implements CloudStackSvcOfferingDao {
 	public static final Logger logger = Logger.getLogger(CloudStackSvcOfferingDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index aff6f81..67abf81 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<MHostVO, Long> implements MHostDao{
 	final SearchBuilder<MHostVO> NameSearch= createSearchBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDaoImpl.java
index 4450da8..8b99f48 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<MHostMountVO, Long> implements MHostMountDao {
     	final SearchBuilder<MHostMountVO> SearchByMHostID = createSearchBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartPartsDaoImpl.java
index 23bee42..6f31495 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<MultiPartPartsVO, Long> implements MultiPartPartsDao {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultiPartUploadsDaoImpl.java
index ce2928d..0f76e80 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<MultiPartUploadsVO, Long> implements MultiPartUploadsDao {
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MultipartMetaDaoImpl.java
index 2bcd626..7ab9359 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<MultipartMetaVO, Long> implements MultipartMetaDao {
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index 5a9a625..cce0f83 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<OfferingBundleVO, Long> implements OfferingDao {
 	public static final Logger logger = Logger.getLogger(OfferingDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDaoImpl.java
index c73c1db..d88660e 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<SAclVO, Long> implements SAclDao {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDaoImpl.java
index 53e9e07..817c682 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<SBucketVO, Long> implements SBucketDao {
     	

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
index efe9500..5eadd06 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<SHostVO, Long> implements SHostDao {
 	public SHostDaoImpl() {}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDaoImpl.java
index e0555ec..8fdc949 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<SMetaVO, Long> implements SMetaDao {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDaoImpl.java
index b588877..3e68152 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<SObjectVO, Long> implements SObjectDao {
     protected final SObjectItemDao itemDao = ComponentLocator.inject(SObjectItemDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDaoImpl.java
index ec632bb..57140c4 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<SObjectItemVO, Long> implements SObjectItemDao {
     

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
index c19c757..684b00b 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<UserCredentialsVO, Long> implements UserCredentialsDao {
 	public static final Logger logger = Logger.getLogger(UserCredentialsDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/core/src/com/cloud/event/dao/EventDaoImpl.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/event/dao/EventDaoImpl.java b/core/src/com/cloud/event/dao/EventDaoImpl.java
index abeefbe..44fbb03 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<EventVO, Long> implements EventDao {
 	public static final Logger s_logger = Logger.getLogger(EventDaoImpl.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/core/src/com/cloud/event/dao/UsageEventDaoImpl.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/event/dao/UsageEventDaoImpl.java b/core/src/com/cloud/event/dao/UsageEventDaoImpl.java
index ea93d53..dafc8d4 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<UsageEventVO, Long> implements UsageEventDao {
     public static final Logger s_logger = Logger.getLogger(UsageEventDaoImpl.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/deployment-planners/user-concentrated-pod/src/com/cloud/deploy/UserConcentratedPodPlanner.java
----------------------------------------------------------------------
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 2ab9856..9e2d08a 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 {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java
----------------------------------------------------------------------
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 2db2051..0f94003 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 {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
----------------------------------------------------------------------
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 7dcb9d3..253e371 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
 {   

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/file-systems/netapp/src/com/cloud/netapp/dao/LunDaoImpl.java
----------------------------------------------------------------------
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 9cc67b7..0218c99 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<LunVO, Long> implements LunDao {
     private static final Logger s_logger = Logger.getLogger(PoolDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/file-systems/netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java
----------------------------------------------------------------------
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 3e23644..a3383c2 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<PoolVO, Long> implements PoolDao {
     private static final Logger s_logger = Logger.getLogger(PoolDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/file-systems/netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
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 4a83429..a53df8a 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<NetappVolumeVO, Long> implements VolumeDao {
     private static final Logger s_logger = Logger.getLogger(VolumeDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
----------------------------------------------------------------------
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 0887ee9..75a8ff7 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
----------------------------------------------------------------------
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 cd15d8f..4ad3663 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 {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java
----------------------------------------------------------------------
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 cceb7fe..165bdec 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java
----------------------------------------------------------------------
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 20221c3..eb99f6a 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;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
index c732b94..b762714 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;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java
index a7e67e1..2f63948 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() {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
----------------------------------------------------------------------
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 546df5f..a0765d8 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
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 a75640b..6026485 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
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 64ded51..5549f14 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java
----------------------------------------------------------------------
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 7d8c5ab..cc25573 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<CiscoNexusVSMDeviceVO, Long> implements CiscoNexusVSMDeviceDao {
 	protected static final Logger s_logger     = Logger.getLogger(CiscoNexusVSMDeviceDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
----------------------------------------------------------------------
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 80c8ecf..990118f 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 {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
index d810c58..fffada6 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
index 585a18c..a6b86aa 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;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
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 9faceaa..d047529 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java
----------------------------------------------------------------------
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 8490534..e1f7c95 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
----------------------------------------------------------------------
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 1cd830c..cc59b90 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<DomainRouterVO> {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java
----------------------------------------------------------------------
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 08c1efb..7913c97 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<ElasticLbVmMapVO, Long> implements ElasticLbVmMapDao {
     protected final DomainRouterDao _routerDao = ComponentLocator.inject(DomainRouterDaoImpl.class);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
----------------------------------------------------------------------
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 13967e3..9c51296 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 {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
----------------------------------------------------------------------
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 cd4a074..4e11007 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 {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/midokura-midonet/src/com/cloud/network/element/MidokuraMidonetElement.java
----------------------------------------------------------------------
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 5673466..9954e80 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/midokura-midonet/src/com/cloud/network/guru/MidokuraMidonetGuestNetworkGuru.java
----------------------------------------------------------------------
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 0526b45..ed0eb3c 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerPodDaoImpl.java
----------------------------------------------------------------------
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 44af53a..30dd06d 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<NetScalerPodVO, Long> implements NetScalerPodDao {
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
----------------------------------------------------------------------
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 77aa447..d356e9e 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 {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpDaoImpl.java
----------------------------------------------------------------------
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 95bfc02..62662c5 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<NiciraNvpDeviceVO, Long>
         implements NiciraNvpDao {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/nicira-nvp/src/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java
----------------------------------------------------------------------
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 31babbb..b40aad4 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<NiciraNvpNicMappingVO, Long> implements NiciraNvpNicMappingDao {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
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 1fcccdb..231d683 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
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 bf785e6..6e9a92d 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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
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 16e1ecc..413e2f8 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
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 1699732..cc67e20 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 = 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java
----------------------------------------------------------------------
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 8794763..99d7d0d 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<OvsTunnelInterfaceVO, Long> implements OvsTunnelInterfaceDao {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java
----------------------------------------------------------------------
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 6e0c02c..099b3ba 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<OvsTunnelNetworkVO, Long> implements OvsTunnelNetworkDao {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/storage-allocators/random/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java
----------------------------------------------------------------------
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 9192703..812867e 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/user-authenticators/ldap/src/com/cloud/server/auth/LDAPUserAuthenticator.java
----------------------------------------------------------------------
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 7c6e52f..a5733ca 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);

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aab02e27/plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
----------------------------------------------------------------------
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 f4b6f02..edba766 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);


Mime
View raw message