From 1a64c247adbeb326f7ddbe6e4feaf3159e9e740d Mon Sep 17 00:00:00 2001 From: cirstofolini Date: Sat, 21 Nov 2015 18:31:11 -0200 Subject: [PATCH] Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. --- core/src/com/cloud/storage/template/IsoProcessor.java | 2 -- core/src/com/cloud/storage/template/OVAProcessor.java | 2 -- core/src/com/cloud/storage/template/QCOW2Processor.java | 2 -- core/src/com/cloud/storage/template/RawImageProcessor.java | 2 -- core/src/com/cloud/storage/template/TARProcessor.java | 2 -- core/src/com/cloud/storage/template/VhdProcessor.java | 2 -- core/src/com/cloud/storage/template/VmdkProcessor.java | 2 -- .../src/com/cloud/agent/manager/AgentManagerImpl.java | 2 -- .../com/cloud/agent/manager/ClusteredAgentManagerImpl.java | 3 --- .../cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java | 2 -- .../src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java | 2 -- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 -- .../engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java | 2 -- .../datacenter/entity/api/db/dao/EngineClusterDaoImpl.java | 2 -- .../datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java | 2 -- .../datacenter/entity/api/db/dao/EngineHostDaoImpl.java | 2 -- .../datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java | 2 -- .../datacenter/entity/api/db/dao/HostDetailsDaoImpl.java | 2 -- .../engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java | 2 -- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 -- engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java | 2 -- engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java | 2 -- .../src/com/cloud/certificate/dao/CertificateDaoImpl.java | 2 -- .../com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java | 2 -- .../src/com/cloud/configuration/dao/ResourceCountDaoImpl.java | 2 -- .../src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 2 -- .../schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 2 -- .../src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 2 -- .../com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java | 2 -- .../src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java | 2 -- .../src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java | 2 -- engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java | 2 -- engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java | 2 -- engine/schema/src/com/cloud/event/dao/EventDaoImpl.java | 2 -- engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java | 2 -- .../src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java | 2 -- engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 2 -- engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 2 -- engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java | 2 -- engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java | 2 -- .../cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java | 2 -- .../network/as/dao/AutoScalePolicyConditionMapDaoImpl.java | 2 -- .../src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java | 2 -- .../src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java | 2 -- .../network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 2 -- .../cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 2 -- .../com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java | 2 -- .../schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java | 2 -- .../schema/src/com/cloud/network/as/dao/CounterDaoImpl.java | 2 -- .../src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java | 2 -- .../com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java | 2 -- .../cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java | 2 -- .../src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java | 2 -- .../src/com/cloud/network/dao/FirewallRulesDaoImpl.java | 2 -- engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java | 2 -- .../cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java | 2 -- .../src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java | 2 -- .../src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java | 2 -- .../src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java | 2 -- .../schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java | 2 -- .../src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java | 2 -- .../src/com/cloud/network/dao/MonitoringServiceDaoImpl.java | 2 -- engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java | 2 -- .../src/com/cloud/network/dao/NetworkDetailsDaoImpl.java | 2 -- .../src/com/cloud/network/dao/NetworkDomainDaoImpl.java | 2 -- .../com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java | 2 -- .../cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java | 2 -- .../src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java | 2 -- .../src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java | 2 -- .../com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java | 2 -- .../schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java | 2 -- .../src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java | 2 -- .../network/dao/PhysicalNetworkServiceProviderDaoImpl.java | 2 -- .../cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java | 2 -- .../schema/src/com/cloud/network/dao/PortProfileDaoImpl.java | 2 -- .../src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java | 2 -- .../cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java | 2 -- .../com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java | 2 -- .../src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java | 2 -- engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java | 2 -- .../src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 -- .../com/cloud/network/dao/VirtualRouterProviderDaoImpl.java | 2 -- engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java | 2 -- .../cloud/network/rules/dao/PortForwardingRulesDaoImpl.java | 2 -- .../com/cloud/network/security/dao/SecurityGroupDaoImpl.java | 2 -- .../cloud/network/security/dao/SecurityGroupRuleDaoImpl.java | 2 -- .../cloud/network/security/dao/SecurityGroupRulesDaoImpl.java | 2 -- .../cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java | 2 -- .../cloud/network/security/dao/SecurityGroupWorkDaoImpl.java | 2 -- .../com/cloud/network/security/dao/VmRulesetLogDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java | 2 -- .../com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java | 2 -- engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 2 -- .../cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java | 2 -- .../src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java | 2 -- .../src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java | 2 -- .../cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java | 2 -- .../src/com/cloud/projects/dao/ProjectAccountDaoImpl.java | 2 -- engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java | 2 -- .../src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java | 2 -- .../src/com/cloud/secstorage/CommandExecLogDaoImpl.java | 2 -- .../src/com/cloud/service/dao/ServiceOfferingDaoImpl.java | 2 -- .../com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java | 2 -- .../schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java | 2 -- engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java | 2 -- engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java | 2 -- engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java | 2 -- .../schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java | 2 -- engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java | 2 -- .../src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java | 2 -- .../schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java | 2 -- engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java | 2 -- .../src/com/cloud/upgrade/DatabaseIntegrityChecker.java | 2 -- engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java | 2 -- .../cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java | 2 -- engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java | 2 -- .../schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 2 -- engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java | 2 -- .../com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 2 -- .../schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java | 2 -- .../src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java | 2 -- .../com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java | 2 -- .../src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 2 -- .../schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 -- .../src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java | 2 -- .../src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 2 -- .../schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 2 -- engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 2 -- engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java | 2 -- engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java | 2 -- engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java | 2 -- engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 2 -- engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java | 2 -- engine/schema/src/com/cloud/user/dao/UserDaoImpl.java | 2 -- .../schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java | 2 -- engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java | 2 -- .../src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java | 2 -- .../src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 2 -- .../src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 2 -- .../src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 2 -- engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 2 -- .../src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 2 -- .../apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java | 2 -- .../cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java | 2 -- .../engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java | 2 -- .../engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java | 2 -- .../engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java | 2 -- .../engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java | 2 -- .../engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java | 2 -- .../cloud/entity/api/db/dao/VolumeReservationDaoImpl.java | 2 -- .../cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java | 2 -- .../src/org/apache/cloudstack/region/PortableIpDaoImpl.java | 2 -- .../org/apache/cloudstack/region/PortableIpRangeDaoImpl.java | 2 -- .../src/org/apache/cloudstack/region/dao/RegionDaoImpl.java | 2 -- .../cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java | 2 -- .../region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java | 2 -- .../resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/DiskOfferingDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/FirewallRuleDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/NetworkACLListDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java | 2 -- .../dao/Site2SiteCustomerGatewayDetailsDaoImpl.java | 2 -- .../dao/Site2SiteVpnConnectionDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java | 2 -- .../cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/UserIpAddressDetailsDaoImpl.java | 2 -- .../cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java | 2 -- .../resourcedetail/dao/VpcGatewayDetailsDaoImpl.java | 2 -- .../storage/datastore/db/PrimaryDataStoreDaoImpl.java | 2 -- .../storage/allocator/ClusterScopeStoragePoolAllocator.java | 3 --- .../allocator/GarbageCollectingStoragePoolAllocator.java | 2 -- .../storage/allocator/LocalStoragePoolAllocator.java | 3 --- .../storage/allocator/UseLocalForRootAllocator.java | 2 -- .../cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java | 2 -- .../src/com/cloud/cluster/ClusterFenceManagerImpl.java | 2 -- .../cluster/src/com/cloud/cluster/ClusterManagerImpl.java | 2 -- .../com/cloud/cluster/dao/ManagementServerHostDaoImpl.java | 2 -- .../cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java | 2 -- .../cloudstack/framework/config/dao/ConfigurationDaoImpl.java | 2 -- framework/db/src/com/cloud/dao/EntityManagerImpl.java | 2 -- .../framework/security/keystore/KeystoreDaoImpl.java | 2 -- .../framework/security/keystore/KeystoreManagerImpl.java | 2 -- .../cloudstack/acl/StaticRoleBasedAPIAccessChecker.java | 2 -- .../cloudstack/affinity/ExplicitDedicationProcessor.java | 2 -- .../apache/cloudstack/affinity/HostAntiAffinityProcessor.java | 2 -- .../apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java | 2 -- .../apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java | 2 -- .../apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java | 2 -- .../src/com/cloud/deploy/ImplicitDedicationPlanner.java | 2 -- .../src/com/cloud/deploy/UserConcentratedPodPlanner.java | 2 -- .../src/com/cloud/deploy/UserDispersingPlanner.java | 2 -- .../org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java | 2 -- .../src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java | 2 -- .../org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 2 -- .../netapp/src/com/cloud/netapp/NetappManagerImpl.java | 2 -- .../netapp/src/com/cloud/netapp/dao/LunDaoImpl.java | 2 -- .../netapp/src/com/cloud/netapp/dao/PoolDaoImpl.java | 2 -- .../netapp/src/com/cloud/netapp/dao/VolumeDaoImpl.java | 2 -- .../src/com/cloud/deploy/SkipHeuresticsPlanner.java | 2 -- .../cloud/agent/manager/allocator/impl/RandomAllocator.java | 2 -- .../com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java | 2 -- .../src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java | 2 -- .../src/com/cloud/baremetal/manager/BareMetalDiscoverer.java | 2 -- .../src/com/cloud/baremetal/manager/BareMetalGuru.java | 2 -- .../src/com/cloud/baremetal/manager/BareMetalPlanner.java | 2 -- .../com/cloud/baremetal/manager/BareMetalTemplateAdapter.java | 2 -- .../src/com/cloud/baremetal/manager/BaremetalManagerImpl.java | 2 -- .../baremetal/networkservice/BareMetalPingServiceImpl.java | 2 -- .../cloud/baremetal/networkservice/BareMetalResourceBase.java | 2 -- .../cloud/baremetal/networkservice/BaremetaNetworkGuru.java | 3 --- .../cloud/baremetal/networkservice/BaremetalDhcpElement.java | 3 --- .../baremetal/networkservice/BaremetalDhcpManagerImpl.java | 2 -- .../networkservice/BaremetalKickStartServiceImpl.java | 2 -- .../cloud/baremetal/networkservice/BaremetalPxeElement.java | 2 -- .../baremetal/networkservice/BaremetalPxeManagerImpl.java | 2 -- .../baremetal/networkservice/BaremetalUserdataElement.java | 2 -- .../hyperv/src/com/cloud/ha/HypervInvestigator.java | 2 -- .../hypervisor/hyperv/discoverer/HypervServerDiscoverer.java | 2 -- .../src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java | 2 -- plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java | 2 -- .../ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java | 2 -- .../ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java | 2 -- .../hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 2 -- .../ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java | 2 -- .../com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java | 2 -- .../com/cloud/hypervisor/ovm3/resources/Ovm3FenceBuilder.java | 2 -- .../cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 2 -- .../src/com/cloud/agent/manager/MockAgentManagerImpl.java | 2 -- .../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 2 -- .../src/com/cloud/agent/manager/MockVmManagerImpl.java | 2 -- .../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 2 -- .../simulator/src/com/cloud/ha/SimulatorFencer.java | 2 -- .../simulator/src/com/cloud/ha/SimulatorInvestigator.java | 2 -- .../simulator/src/com/cloud/resource/SimulatorDiscoverer.java | 2 -- .../src/com/cloud/resource/SimulatorSecondaryDiscoverer.java | 2 -- .../simulator/src/com/cloud/simulator/SimulatorGuru.java | 2 -- .../src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java | 2 -- .../src/com/cloud/simulator/dao/MockHostDaoImpl.java | 2 -- .../src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java | 2 -- .../src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java | 2 -- .../src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java | 2 -- .../simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java | 2 -- .../src/com/cloud/simulator/dao/MockVolumeDaoImpl.java | 2 -- .../ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java | 2 -- .../ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java | 2 -- plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java | 2 -- .../vmware/src/com/cloud/ha/VmwareInvestigator.java | 2 -- .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 2 -- .../com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java | 2 -- .../com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 2 -- .../cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java | 2 -- .../hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java | 2 -- .../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 -- .../src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 -- .../src/com/cloud/network/element/CiscoNexusVSMElement.java | 2 -- .../xenserver/src/com/cloud/ha/XenServerFencer.java | 2 -- .../xenserver/src/com/cloud/hypervisor/XenServerGuru.java | 2 -- .../hypervisor/xenserver/discoverer/XcpServerDiscoverer.java | 2 -- .../src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java | 2 -- .../src/com/cloud/network/element/BigSwitchBcfElement.java | 4 ---- .../com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java | 2 -- .../src/com/cloud/network/dao/BrocadeVcsDaoImpl.java | 2 -- .../network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java | 2 -- .../src/com/cloud/network/element/BrocadeVcsElement.java | 2 -- .../com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java | 2 -- .../src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java | 2 -- .../src/com/cloud/network/dao/CiscoVnmcDaoImpl.java | 2 -- .../src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java | 2 -- .../src/com/cloud/network/element/CiscoVnmcElement.java | 2 -- .../org/apache/cloudstack/network/element/DnsNotifier.java | 2 -- .../com/cloud/network/element/ElasticLoadBalancerElement.java | 2 -- .../com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java | 2 -- .../src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java | 2 -- .../cloud/network/element/F5ExternalLoadBalancerElement.java | 2 -- .../globo/globodns/cloudstack/element/GloboDnsElement.java | 2 -- .../network/element/InternalLoadBalancerElement.java | 3 --- .../network/lb/InternalLoadBalancerVMManagerImpl.java | 2 -- .../network/contrail/management/ContrailElementImpl.java | 2 -- .../cloudstack/network/contrail/management/ContrailGuru.java | 2 -- .../network/contrail/management/ContrailManagerImpl.java | 2 -- .../network/contrail/management/ContrailVpcElementImpl.java | 2 -- .../network/element/JuniperSRXExternalFirewallElement.java | 2 -- .../midonet/src/com/cloud/network/element/MidoNetElement.java | 3 --- .../src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java | 2 -- .../src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java | 2 -- .../src/com/cloud/network/dao/NetScalerPodDaoImpl.java | 2 -- .../src/com/cloud/network/element/NetscalerElement.java | 2 -- .../src/main/java/com/cloud/network/dao/NiciraNvpDaoImpl.java | 2 -- .../com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java | 2 -- .../com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java | 2 -- .../main/java/com/cloud/network/element/NiciraNvpElement.java | 3 --- .../com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java | 2 -- .../nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java | 2 -- .../src/com/cloud/network/element/NuageVspElement.java | 2 -- .../src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java | 2 -- .../src/com/cloud/network/manager/NuageVspManagerImpl.java | 2 -- .../cloudstack/network/opendaylight/OpendaylightElement.java | 3 --- .../ovs/src/com/cloud/network/element/OvsElement.java | 4 ---- .../ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java | 2 -- .../src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java | 2 -- .../ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java | 2 -- .../com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java | 2 -- .../com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java | 2 -- .../network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java | 2 -- .../network/element/PaloAltoExternalFirewallElement.java | 2 -- .../apache/cloudstack/network/dao/SspCredentialDaoImpl.java | 2 -- .../org/apache/cloudstack/network/dao/SspTenantDaoImpl.java | 2 -- .../src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java | 2 -- .../src/org/apache/cloudstack/network/element/SspElement.java | 3 --- .../apache/cloudstack/network/guru/SspGuestNetworkGuru.java | 3 --- .../src/com/cloud/network/guru/VxlanGuestNetworkGuru.java | 2 -- .../storage/allocator/RandomStoragePoolAllocator.java | 3 --- .../apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java | 2 -- .../org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java | 2 -- .../md5/src/com/cloud/server/auth/MD5UserAuthenticator.java | 2 -- .../cloudstack/server/auth/PBKDF2UserAuthenticator.java | 2 -- .../src/com/cloud/server/auth/PlainTextUserAuthenticator.java | 2 -- .../src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java | 3 --- .../org/apache/cloudstack/saml/SAML2UserAuthenticator.java | 3 --- .../src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java | 2 -- .../com/cloud/server/auth/SHA256SaltedUserAuthenticator.java | 2 -- server/src/com/cloud/acl/AffinityGroupAccessChecker.java | 3 --- server/src/com/cloud/acl/DomainChecker.java | 2 -- .../cloud/agent/manager/allocator/impl/FirstFitAllocator.java | 2 -- .../manager/allocator/impl/FirstFitRoutingAllocator.java | 3 --- .../agent/manager/allocator/impl/RecreateHostAllocator.java | 3 --- .../cloud/agent/manager/allocator/impl/TestingAllocator.java | 2 -- .../manager/allocator/impl/UserConcentratedAllocator.java | 2 -- .../cloud/agent/manager/authn/impl/BasicAgentAuthManager.java | 2 -- server/src/com/cloud/alert/AlertManagerImpl.java | 2 -- server/src/com/cloud/alert/ClusterAlertAdapter.java | 2 -- server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java | 2 -- .../src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java | 2 -- .../src/com/cloud/api/auth/APIAuthenticationManagerImpl.java | 2 -- server/src/com/cloud/api/query/QueryManagerImpl.java | 2 -- server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/HostTagDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java | 2 -- .../com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java | 2 -- .../com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java | 2 -- .../com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/StorageTagDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 2 -- .../src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 -- server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 2 -- server/src/com/cloud/capacity/CapacityManagerImpl.java | 2 -- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 -- .../com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java | 2 -- .../consoleproxy/AgentBasedStandaloneConsoleProxyManager.java | 2 -- .../com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java | 2 -- .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 -- .../src/com/cloud/consoleproxy/StaticConsoleProxyManager.java | 2 -- server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 2 -- .../src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 2 -- server/src/com/cloud/deploy/FirstFitPlanner.java | 2 -- .../com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java | 2 -- server/src/com/cloud/event/dao/EventJoinDaoImpl.java | 2 -- server/src/com/cloud/ha/CheckOnAgentInvestigator.java | 2 -- server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java | 2 -- server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 2 -- server/src/com/cloud/ha/KVMFencer.java | 2 -- server/src/com/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 -- server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 2 -- .../src/com/cloud/hypervisor/CloudZonesStartupProcessor.java | 2 -- .../src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java | 2 -- server/src/com/cloud/hypervisor/KVMGuru.java | 2 -- server/src/com/cloud/hypervisor/LXCGuru.java | 2 -- .../cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java | 3 --- .../cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java | 3 --- .../src/com/cloud/metadata/ResourceMetaDataManagerImpl.java | 2 -- .../src/com/cloud/network/ExternalDeviceUsageManagerImpl.java | 2 -- server/src/com/cloud/network/ExternalIpAddressAllocator.java | 2 -- .../com/cloud/network/ExternalNetworkDeviceManagerImpl.java | 2 -- server/src/com/cloud/network/Ipv6AddressManagerImpl.java | 2 -- server/src/com/cloud/network/NetworkModelImpl.java | 2 -- server/src/com/cloud/network/NetworkServiceImpl.java | 2 -- server/src/com/cloud/network/NetworkUsageManagerImpl.java | 2 -- server/src/com/cloud/network/StorageNetworkManagerImpl.java | 2 -- server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 2 -- .../com/cloud/network/element/CloudZonesNetworkElement.java | 2 -- .../src/com/cloud/network/element/SecurityGroupElement.java | 2 -- .../src/com/cloud/network/element/VirtualRouterElement.java | 3 --- .../com/cloud/network/element/VpcVirtualRouterElement.java | 4 ---- .../src/com/cloud/network/firewall/FirewallManagerImpl.java | 2 -- server/src/com/cloud/network/guru/ControlNetworkGuru.java | 2 -- server/src/com/cloud/network/guru/DirectNetworkGuru.java | 2 -- .../src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java | 2 -- .../src/com/cloud/network/guru/ExternalGuestNetworkGuru.java | 2 -- server/src/com/cloud/network/guru/GuestNetworkGuru.java | 2 -- server/src/com/cloud/network/guru/PodBasedNetworkGuru.java | 2 -- server/src/com/cloud/network/guru/PrivateNetworkGuru.java | 2 -- server/src/com/cloud/network/guru/PublicNetworkGuru.java | 2 -- server/src/com/cloud/network/guru/StorageNetworkGuru.java | 2 -- server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java | 2 -- .../com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 2 -- .../network/router/VirtualNetworkApplianceManagerImpl.java | 2 -- .../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 3 --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 2 -- .../com/cloud/network/security/SecurityGroupManagerImpl.java | 2 -- .../com/cloud/network/security/SecurityGroupManagerImpl2.java | 2 -- server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java | 2 -- server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 2 -- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 -- .../src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 2 -- server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 2 -- server/src/com/cloud/projects/ProjectManagerImpl.java | 2 -- server/src/com/cloud/resource/DummyHostDiscoverer.java | 2 -- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 -- .../src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 2 -- .../src/com/cloud/server/auth/DefaultUserAuthenticator.java | 2 -- server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java | 2 -- server/src/com/cloud/storage/OCFS2ManagerImpl.java | 2 -- server/src/com/cloud/storage/StorageManagerImpl.java | 2 -- .../src/com/cloud/storage/download/DownloadMonitorImpl.java | 2 -- .../storage/secondary/SecondaryStorageVmDefaultAllocator.java | 2 -- .../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 -- .../src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java | 2 -- server/src/com/cloud/storage/upload/UploadMonitorImpl.java | 2 -- server/src/com/cloud/tags/TaggedResourceManagerImpl.java | 2 -- server/src/com/cloud/template/HypervisorTemplateAdapter.java | 2 -- server/src/com/cloud/template/TemplateManagerImpl.java | 2 -- server/src/com/cloud/usage/UsageServiceImpl.java | 2 -- server/src/com/cloud/user/AccountManagerImpl.java | 2 -- server/src/com/cloud/user/DomainManagerImpl.java | 2 -- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 -- server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 -- .../apache/cloudstack/affinity/AffinityGroupServiceImpl.java | 2 -- .../network/lb/ApplicationLoadBalancerManagerImpl.java | 2 -- .../src/org/apache/cloudstack/region/RegionManagerImpl.java | 2 -- .../src/org/apache/cloudstack/region/RegionServiceImpl.java | 2 -- server/test/com/cloud/alert/MockAlertManagerImpl.java | 2 -- server/test/com/cloud/network/MockFirewallManagerImpl.java | 2 -- server/test/com/cloud/network/MockNetworkModelImpl.java | 2 -- .../cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java | 2 -- server/test/com/cloud/projects/MockProjectManagerImpl.java | 2 -- server/test/com/cloud/resource/MockResourceManagerImpl.java | 2 -- server/test/com/cloud/user/MockAccountManagerImpl.java | 2 -- server/test/com/cloud/user/MockDomainManagerImpl.java | 2 -- server/test/com/cloud/vpc/MockConfigurationManagerImpl.java | 2 -- server/test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 -- server/test/com/cloud/vpc/MockNetworkModelImpl.java | 2 -- server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java | 2 -- server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 2 -- .../test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java | 2 -- .../com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java | 2 -- server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java | 2 -- server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 2 -- server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 2 -- .../cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java | 3 --- .../test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java | 2 -- server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 2 -- server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java | 2 -- .../com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 2 -- .../src/org/apache/cloudstack/iam/IAMApiServiceImpl.java | 2 -- .../org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java | 2 -- .../src/org/apache/cloudstack/iam/server/IAMServiceImpl.java | 2 -- .../secondarystorage/PremiumSecondaryStorageManagerImpl.java | 2 -- .../secondarystorage/SecondaryStorageManagerImpl.java | 2 -- .../storage/resource/SecondaryStorageDiscoverer.java | 2 -- .../cloudstack/storage/template/DownloadManagerImpl.java | 2 -- usage/src/com/cloud/usage/UsageAlertManagerImpl.java | 2 -- usage/src/com/cloud/usage/UsageManagerImpl.java | 2 -- .../com/cloud/utils/backoff/impl/ConstantTimeBackoff.java | 2 -- .../cloudstack/utils/identity/ManagementServerNode.java | 2 -- 519 files changed, 1066 deletions(-) diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java index 4d0a331f547..271818ccd91 100644 --- a/core/src/com/cloud/storage/template/IsoProcessor.java +++ b/core/src/com/cloud/storage/template/IsoProcessor.java @@ -22,7 +22,6 @@ package com.cloud.storage.template; import java.io.File; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -31,7 +30,6 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.utils.component.AdapterBase; -@Local(value = Processor.class) public class IsoProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(IsoProcessor.class); diff --git a/core/src/com/cloud/storage/template/OVAProcessor.java b/core/src/com/cloud/storage/template/OVAProcessor.java index e0003b1609c..31523b6e4d0 100644 --- a/core/src/com/cloud/storage/template/OVAProcessor.java +++ b/core/src/com/cloud/storage/template/OVAProcessor.java @@ -22,7 +22,6 @@ package com.cloud.storage.template; import java.io.File; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import javax.xml.parsers.DocumentBuilderFactory; @@ -36,7 +35,6 @@ import com.cloud.storage.StorageLayer; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.script.Script; -@Local(value = Processor.class) public class OVAProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(OVAProcessor.class); diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java index 096b0b6f32a..642d8d3cb7b 100644 --- a/core/src/com/cloud/storage/template/QCOW2Processor.java +++ b/core/src/com/cloud/storage/template/QCOW2Processor.java @@ -24,7 +24,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.exception.InternalErrorException; @@ -35,7 +34,6 @@ import com.cloud.storage.StorageLayer; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.AdapterBase; -@Local(value = Processor.class) public class QCOW2Processor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(QCOW2Processor.class); private static final int VIRTUALSIZE_HEADER_LOCATION = 24; diff --git a/core/src/com/cloud/storage/template/RawImageProcessor.java b/core/src/com/cloud/storage/template/RawImageProcessor.java index 820ef1986f5..5645a3199a7 100644 --- a/core/src/com/cloud/storage/template/RawImageProcessor.java +++ b/core/src/com/cloud/storage/template/RawImageProcessor.java @@ -22,7 +22,6 @@ package com.cloud.storage.template; import java.io.File; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -32,7 +31,6 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.utils.component.AdapterBase; -@Local(value = Processor.class) public class RawImageProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(RawImageProcessor.class); StorageLayer _storage; diff --git a/core/src/com/cloud/storage/template/TARProcessor.java b/core/src/com/cloud/storage/template/TARProcessor.java index 96c866e4a03..dfd9a0adf25 100644 --- a/core/src/com/cloud/storage/template/TARProcessor.java +++ b/core/src/com/cloud/storage/template/TARProcessor.java @@ -24,12 +24,10 @@ import com.cloud.storage.StorageLayer; import com.cloud.utils.component.AdapterBase; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.naming.ConfigurationException; import java.io.File; import java.util.Map; -@Local(value = Processor.class) public class TARProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(TARProcessor.class); diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java index 0b68f895fd6..605d2a376e1 100644 --- a/core/src/com/cloud/storage/template/VhdProcessor.java +++ b/core/src/com/cloud/storage/template/VhdProcessor.java @@ -24,7 +24,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.exception.InternalErrorException; @@ -41,7 +40,6 @@ import com.cloud.utils.component.AdapterBase; * into the VHD format. * */ -@Local(value = Processor.class) public class VhdProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(VhdProcessor.class); diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java index 3d399f5791b..eacabb93968 100644 --- a/core/src/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/com/cloud/storage/template/VmdkProcessor.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -38,7 +37,6 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.utils.component.AdapterBase; -@Local(value = Processor.class) public class VmdkProcessor extends AdapterBase implements Processor { private static final Logger s_logger = Logger.getLogger(VmdkProcessor.class); diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index ef8a373e269..73feeebc2ab 100644 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -34,7 +34,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -116,7 +115,6 @@ import com.cloud.utils.time.InaccurateClock; /** * Implementation of the Agent Manager. This class controls the connection to the agents. **/ -@Local(value = {AgentManager.class}) public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory, Configurable { protected static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class); protected static final Logger status_logger = Logger.getLogger(Status.class); diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index 04be1ab7ee4..f707781e4d1 100644 --- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -37,7 +37,6 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.net.ssl.SSLContext; @@ -52,7 +51,6 @@ import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.cloudstack.utils.security.SSLUtils; import org.apache.log4j.Logger; -import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CancelCommand; import com.cloud.agent.api.ChangeAgentAnswer; @@ -95,7 +93,6 @@ import com.cloud.utils.nio.Link; import com.cloud.utils.nio.Task; import com.google.gson.Gson; -@Local(value = {AgentManager.class, ClusteredAgentRebalanceService.class}) public class ClusteredAgentManagerImpl extends AgentManagerImpl implements ClusterManagerListener, ClusteredAgentRebalanceService { final static Logger s_logger = Logger.getLogger(ClusteredAgentManagerImpl.class); private static final ScheduledExecutorService s_transferExecutor = Executors.newScheduledThreadPool(2, new NamedThreadFactory("Cluster-AgentRebalancingExecutor")); diff --git a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java index 254f1bf0bbb..c774470b758 100644 --- a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java +++ b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java @@ -24,7 +24,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -39,7 +38,6 @@ import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = AgentLoadBalancerPlanner.class) public class ClusterBasedAgentLoadBalancerPlanner extends AdapterBase implements AgentLoadBalancerPlanner { private static final Logger s_logger = Logger.getLogger(AgentLoadBalancerPlanner.class); diff --git a/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java index d7d472064e0..77c69f34bf8 100644 --- a/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.vm; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -27,7 +26,6 @@ import com.cloud.cluster.ClusterManager; import com.cloud.cluster.ClusterManagerListener; import com.cloud.cluster.ManagementServerHost; -@Local(value = VirtualMachineManager.class) public class ClusteredVirtualMachineManagerImpl extends VirtualMachineManagerImpl implements ClusterManagerListener { @Inject diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index f972539fc7d..5c5838951f9 100644 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -34,7 +34,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -204,7 +203,6 @@ import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.snapshot.VMSnapshotManager; import com.cloud.vm.snapshot.dao.VMSnapshotDao; -@Local(value = VirtualMachineManager.class) public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMachineManager, VmWorkJobHandler, Listener, Configurable { private static final Logger s_logger = Logger.getLogger(VirtualMachineManagerImpl.class); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java index b93d8f5d796..597b55b4d9b 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component(value = "EngineDcDetailsDao") -@Local(value = DcDetailsDao.class) public class DcDetailsDaoImpl extends GenericDaoBase implements DcDetailsDao { protected final SearchBuilder DcSearch; protected final SearchBuilder DetailSearch; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java index b21b230d36f..10c75d56db0 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -51,7 +50,6 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; @Component(value = "EngineClusterDao") -@Local(value = EngineClusterDao.class) public class EngineClusterDaoImpl extends GenericDaoBase implements EngineClusterDao { private static final Logger s_logger = Logger.getLogger(EngineClusterDaoImpl.class); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java index 17833f8f3b6..a0d484c6193 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.TableGenerator; @@ -53,7 +52,6 @@ import com.cloud.utils.net.NetUtils; * } **/ @Component(value = "EngineDataCenterDao") -@Local(value = {EngineDataCenterDao.class}) public class EngineDataCenterDaoImpl extends GenericDaoBase implements EngineDataCenterDao { private static final Logger s_logger = Logger.getLogger(EngineDataCenterDaoImpl.class); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java index 3a45976877d..d0d266cdf30 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.TableGenerator; @@ -59,7 +58,6 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; @Component(value = "EngineHostDao") -@Local(value = {EngineHostDao.class}) @DB @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1) public class EngineHostDaoImpl extends GenericDaoBase implements EngineHostDao { diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java index 46480ef424f..1eb0857a61d 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -44,7 +43,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.UpdateBuilder; @Component(value = "EngineHostPodDao") -@Local(value = {EngineHostPodDao.class}) public class EngineHostPodDaoImpl extends GenericDaoBase implements EngineHostPodDao { private static final Logger s_logger = Logger.getLogger(EngineHostPodDaoImpl.class); diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java index 76f83eab3b9..b954f2d249a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component(value = "EngineHostDetailsDao") -@Local(value = HostDetailsDao.class) public class HostDetailsDaoImpl extends GenericDaoBase implements HostDetailsDao { protected final SearchBuilder HostSearch; protected final SearchBuilder DetailSearch; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java index 40e8a99be59..3381acab379 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.engine.datacenter.entity.api.db.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component(value = "EngineHostTagsDao") -@Local(value = HostTagsDao.class) public class HostTagsDaoImpl extends GenericDaoBase implements HostTagsDao { protected final SearchBuilder HostSearch; diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index e60e3464a36..87ace2a1ca7 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -33,7 +33,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -211,7 +210,6 @@ import com.cloud.vm.dao.VMInstanceDao; /** * NetworkManagerImpl implements NetworkManager. */ -@Local(value = {NetworkOrchestrationService.class}) public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestrationService, Listener, Configurable { static final Logger s_logger = Logger.getLogger(NetworkOrchestrator.class); diff --git a/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java b/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java index 865b8d1898c..94d01f472ba 100644 --- a/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java +++ b/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.alert.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {AlertDao.class}) public class AlertDaoImpl extends GenericDaoBase implements AlertDao { protected final SearchBuilder AlertSearchByIdsAndType; diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java index cdb69ce8dee..69dc0146a22 100644 --- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java +++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -50,7 +49,6 @@ import com.cloud.utils.db.TransactionLegacy; 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/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java b/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java index 978fee04401..9544804284e 100644 --- a/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java +++ b/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.certificate.dao; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = {CertificateDao.class}) @DB public class CertificateDaoImpl extends GenericDaoBase implements CertificateDao { diff --git a/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java b/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java index 483ea45172a..e1c0dbd9e47 100644 --- a/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java +++ b/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java @@ -20,7 +20,6 @@ import java.util.Date; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {HostTransferMapDao.class}) @DB public class HostTransferMapDaoImpl extends GenericDaoBase implements HostTransferMapDao { private static final Logger s_logger = Logger.getLogger(HostTransferMapDaoImpl.class); diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java index be429b518a9..879515a455e 100644 --- a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java +++ b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -41,7 +40,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {ResourceCountDao.class}) public class ResourceCountDaoImpl extends GenericDaoBase implements ResourceCountDao { private final SearchBuilder TypeSearch; diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java index 1b033c09ff3..03c2d2a4624 100644 --- a/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java +++ b/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.configuration.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ 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/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java index c9397c2574f..a9323229594 100644 --- a/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey.Scope; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; -@Local(value = ClusterDetailsDao.class) public class ClusterDetailsDaoImpl extends GenericDaoBase implements ClusterDetailsDao, ScopedConfigStorage { protected final SearchBuilder ClusterSearch; protected final SearchBuilder DetailSearch; diff --git a/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java index c9ea999c3d0..12114770f11 100644 --- a/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.dc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AccountVlanMapDao.class}) public class AccountVlanMapDaoImpl extends GenericDaoBase implements AccountVlanMapDao { protected SearchBuilder AccountSearch; diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java index c0f86f33b21..3459e514b71 100644 --- a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -44,7 +43,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = ClusterDao.class) public class ClusterDaoImpl extends GenericDaoBase implements ClusterDao { protected final SearchBuilder PodSearch; diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java index 8c0dbe79621..12db9f6b654 100644 --- a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.dc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = ClusterVSMMapDao.class) @DB public class ClusterVSMMapDaoImpl extends GenericDaoBase implements ClusterVSMMapDao { diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java index 373446e780a..847a24730fc 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.TableGenerator; @@ -56,7 +55,6 @@ import com.cloud.utils.net.NetUtils; * } **/ @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/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java index f3b9efe4851..8bc9effc7f0 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.dc.dao; -import javax.ejb.Local; import org.apache.cloudstack.api.ResourceDetail; import org.apache.cloudstack.framework.config.ConfigKey; @@ -26,7 +25,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.dc.DataCenterDetailVO; -@Local(value = DataCenterDetailsDao.class) public class DataCenterDetailsDaoImpl extends ResourceDetailsDaoBase implements DataCenterDetailsDao, ScopedConfigStorage { @Override diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java index 9486650e90b..ae8ae0cbb54 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java @@ -21,7 +21,6 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -38,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @Component -@Local(value = {DataCenterIpAddressDao.class}) @DB public class DataCenterIpAddressDaoImpl extends GenericDaoBase implements DataCenterIpAddressDao { private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class); diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java index 59171230493..4fa3ad75ab5 100644 --- a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java @@ -22,7 +22,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -40,7 +39,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @Component -@Local(value = {DataCenterLinkLocalIpAddressDaoImpl.class}) @DB public class DataCenterLinkLocalIpAddressDaoImpl extends GenericDaoBase implements DataCenterLinkLocalIpAddressDao { private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class); diff --git a/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java index 1137eb80ca6..8d689e3a4a8 100644 --- a/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java index ff60d74fb24..cffb7df2f8f 100644 --- a/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.dc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {PodVlanMapDao.class}) public class PodVlanMapDaoImpl extends GenericDaoBase implements PodVlanMapDao { protected SearchBuilder PodSearch; diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java index 2e7381ca8ff..87c4d99cf36 100644 --- a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.dc.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {StorageNetworkIpAddressDao.class}) @DB public class StorageNetworkIpAddressDaoImpl extends GenericDaoBase implements StorageNetworkIpAddressDao { protected final GenericSearchBuilder countInUserIp; diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java index bd49e57188a..4475f228584 100644 --- a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.dc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {StorageNetworkIpRangeDao.class}) @DB public class StorageNetworkIpRangeDaoImpl extends GenericDaoBase implements StorageNetworkIpRangeDao { protected final GenericSearchBuilder countRanges; diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java index 1003053f90b..165ef219c4e 100644 --- a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -45,7 +44,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {VlanDao.class}) public class VlanDaoImpl extends GenericDaoBase implements VlanDao { private final String FindZoneWideVlans = diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java index 223172e0d67..4316e3bc8ed 100644 --- a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java +++ b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java index be589e7649b..d4627904f0b 100644 --- a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java +++ b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.event.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {EventDao.class}) public class EventDaoImpl extends GenericDaoBase implements EventDao { public static final Logger s_logger = Logger.getLogger(EventDaoImpl.class.getName()); protected final SearchBuilder CompletedEventSearch; diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java index 1739254bd8b..519b2ecfe73 100644 --- a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java +++ b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -42,7 +41,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @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/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java index 35d77c12b08..43e00efc1ad 100644 --- a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.event.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {UsageEventDetailsDao.class}) public class UsageEventDetailsDaoImpl extends GenericDaoBase implements UsageEventDetailsDao { public static final Logger s_logger = Logger.getLogger(UsageEventDetailsDaoImpl.class.getName()); diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java b/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java index 6bddea262ed..25f8d245a3b 100644 --- a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java +++ b/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.gpu.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = HostGpuGroupsDao.class) public class HostGpuGroupsDaoImpl extends GenericDaoBase implements HostGpuGroupsDao { private static final Logger s_logger = Logger.getLogger(HostGpuGroupsDaoImpl.class); diff --git a/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java b/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java index 96e3a6277f8..d4e31d365d9 100644 --- a/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java +++ b/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map.Entry; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -41,7 +40,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = VGPUTypesDao.class) public class VGPUTypesDaoImpl extends GenericDaoBase implements VGPUTypesDao { private static final Logger s_logger = Logger.getLogger(VGPUTypesDaoImpl.class); diff --git a/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java index 2c64746d08e..6a8ff563642 100644 --- a/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/host/dao/HostDetailsDaoImpl.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = HostDetailsDao.class) public class HostDetailsDaoImpl extends GenericDaoBase implements HostDetailsDao { protected final SearchBuilder HostSearch; protected final SearchBuilder DetailSearch; diff --git a/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java index e275e04cc29..48eb8f1394e 100644 --- a/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java +++ b/engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.host.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = HostTagsDao.class) public class HostTagsDaoImpl extends GenericDaoBase implements HostTagsDao { protected final SearchBuilder HostSearch; protected final GenericSearchBuilder DistinctImplictTagsSearch; diff --git a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java index 2b94e69737d..b4d2f6f785f 100644 --- a/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java +++ b/engine/schema/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.hypervisor.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = HypervisorCapabilitiesDao.class) public class HypervisorCapabilitiesDaoImpl extends GenericDaoBase implements HypervisorCapabilitiesDao { private static final Logger s_logger = Logger.getLogger(HypervisorCapabilitiesDaoImpl.class); diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java index fd4bfd57175..713fec3241d 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.as.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AutoScalePolicyConditionMapDao.class}) public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase implements AutoScalePolicyConditionMapDao { private SearchCriteria getSearchCriteria(Long policyId, Long conditionId) { diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java index 684aaada34c..a0dc989dd50 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.as.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AutoScalePolicyDao.class}) public class AutoScalePolicyDaoImpl extends GenericDaoBase implements AutoScalePolicyDao { @Override diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java index 9f73cf89e0f..eb4716529c9 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.as.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = {AutoScaleVmGroupDao.class}) public class AutoScaleVmGroupDaoImpl extends GenericDaoBase implements AutoScaleVmGroupDao { @Override diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java index 01aac2f33db..830a8c453fe 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.as.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {AutoScaleVmGroupPolicyMapDao.class}) public class AutoScaleVmGroupPolicyMapDaoImpl extends GenericDaoBase implements AutoScaleVmGroupPolicyMapDao { @Override diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java index 463477c74c6..24a3c1013cf 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.as.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AutoScaleVmGroupVmMapDao.class}) public class AutoScaleVmGroupVmMapDaoImpl extends GenericDaoBase implements AutoScaleVmGroupVmMapDao { @Override diff --git a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java index 3e2dd258b28..cc40d16f379 100644 --- a/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.as.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AutoScaleVmProfileDao.class}) public class AutoScaleVmProfileDaoImpl extends GenericDaoBase implements AutoScaleVmProfileDao { @Override diff --git a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java index 2bb8fd3b61f..db4f781bebf 100644 --- a/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java @@ -17,7 +17,6 @@ package com.cloud.network.as.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = ConditionDao.class) public class ConditionDaoImpl extends GenericDaoBase implements ConditionDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java b/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java index 0abc3a003a4..dde7d030784 100644 --- a/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java +++ b/engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.as.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = CounterDao.class) public class CounterDaoImpl extends GenericDaoBase implements CounterDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java index a31798fc923..686dc9c84e8 100644 --- a/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AccountGuestVlanMapDao.class}) @DB public class AccountGuestVlanMapDaoImpl extends GenericDaoBase implements AccountGuestVlanMapDao { diff --git a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java index 11fa5ed7698..2b25b73104d 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = ExternalFirewallDeviceDao.class) @DB public class ExternalFirewallDeviceDaoImpl extends GenericDaoBase implements ExternalFirewallDeviceDao { final SearchBuilder physicalNetworkServiceProviderSearch; diff --git a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java index da23bcfad05..f2706d9b215 100644 --- a/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = ExternalLoadBalancerDeviceDao.class) @DB public class ExternalLoadBalancerDeviceDaoImpl extends GenericDaoBase implements ExternalLoadBalancerDeviceDao { final SearchBuilder physicalNetworkIdSearch; diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java index e89536b990c..bfaf5627a5c 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = FirewallRulesCidrsDao.class) public class FirewallRulesCidrsDaoImpl extends GenericDaoBase implements FirewallRulesCidrsDao { private static final Logger s_logger = Logger.getLogger(FirewallRulesCidrsDaoImpl.class); protected final SearchBuilder CidrsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java index 6a4348691c0..45ab1f84512 100644 --- a/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -42,7 +41,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = FirewallRulesDao.class) @DB public class FirewallRulesDaoImpl extends GenericDaoBase implements FirewallRulesDao { diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java index 63278c2e93c..7b5746d7799 100644 --- a/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java @@ -22,7 +22,6 @@ import java.util.Date; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao; @@ -47,7 +46,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.Ip; @Component -@Local(value = {IPAddressDao.class}) @DB public class IPAddressDaoImpl extends GenericDaoBase implements IPAddressDao { private static final Logger s_logger = Logger.getLogger(IPAddressDaoImpl.class); diff --git a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java index 54d34fac6c6..1c3f231f9c1 100644 --- a/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/InlineLoadBalancerNicMapDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {InlineLoadBalancerNicMapDao.class}) public class InlineLoadBalancerNicMapDaoImpl extends GenericDaoBase implements InlineLoadBalancerNicMapDao { @Override diff --git a/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java index 52c1d0e1ead..45927f3c377 100644 --- a/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LBHealthCheckPolicyDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {LBHealthCheckPolicyDao.class}) public class LBHealthCheckPolicyDaoImpl extends GenericDaoBase implements LBHealthCheckPolicyDao { @Override diff --git a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java index e8295c592df..717458fdb99 100644 --- a/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LBStickinessPolicyDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {LBStickinessPolicyDao.class}) public class LBStickinessPolicyDaoImpl extends GenericDaoBase implements LBStickinessPolicyDao { @Override diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java index 9986337218f..2833c332b02 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerCertMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.utils.db.GenericDaoBase; @@ -26,7 +25,6 @@ import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -@Local(value = {LoadBalancerCertMapDao.class}) public class LoadBalancerCertMapDaoImpl extends GenericDaoBase implements LoadBalancerCertMapDao { private final SearchBuilder listByCertId; diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java index 8ef6215166d..0ad768db3b9 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {LoadBalancerDao.class}) public class LoadBalancerDaoImpl extends GenericDaoBase implements LoadBalancerDao { private final SearchBuilder ListByIp; protected final SearchBuilder TransitionStateSearch; diff --git a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java index cbfda8fadb3..b32320a84cb 100644 --- a/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = {LoadBalancerVMMapDao.class}) public class LoadBalancerVMMapDaoImpl extends GenericDaoBase implements LoadBalancerVMMapDao { @Override diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java index fffb42b3f5e..75bdf30759f 100644 --- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = MonitoringServiceDao.class) public class MonitoringServiceDaoImpl extends GenericDaoBase implements MonitoringServiceDao { private final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java index 3c799851375..0c4354bac82 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.Random; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.TableGenerator; @@ -56,7 +55,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.net.NetUtils; @Component -@Local(value = NetworkDao.class) @DB() public class NetworkDaoImpl extends GenericDaoBase implements NetworkDao { SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java index 0874a3b22d0..7fc8cdab0b0 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package com.cloud.network.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; @Component -@Local(value = NetworkDetailsDao.class) public class NetworkDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkDetailsDao { @Override diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java index e5ee255b0b1..188f306cecc 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkDomainDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NetworkDomainDao.class) @DB() public class NetworkDomainDaoImpl extends GenericDaoBase implements NetworkDomainDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java index 803da2fd3e2..e015118c9c0 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalFirewallDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NetworkExternalFirewallDao.class) @DB() public class NetworkExternalFirewallDaoImpl extends GenericDaoBase implements NetworkExternalFirewallDao { diff --git a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java index d7432cee7c2..1dc07a78b23 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkExternalLoadBalancerDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NetworkExternalLoadBalancerDao.class) @DB() public class NetworkExternalLoadBalancerDaoImpl extends GenericDaoBase implements NetworkExternalLoadBalancerDao { diff --git a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java index ebb1eb2326b..d8cfd081328 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkRuleConfigDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ 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/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java index b2cb7e469c9..31e083075fa 100644 --- a/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/NetworkServiceMapDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = NetworkServiceMapDao.class) @DB() public class NetworkServiceMapDaoImpl extends GenericDaoBase implements NetworkServiceMapDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java index b92512e6d91..451320ac9b6 100644 --- a/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java @@ -20,9 +20,7 @@ package com.cloud.network.dao; import com.cloud.utils.db.GenericDaoBase; import org.springframework.stereotype.Component; -import javax.ejb.Local; @Component -@Local(value=OpRouterMonitorServiceDao.class) public class OpRouterMonitorServiceDaoImpl extends GenericDaoBase implements OpRouterMonitorServiceDao { } diff --git a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java index ee13197c0bc..14edd803497 100644 --- a/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = OvsProviderDao.class) @DB() public class OvsProviderDaoImpl extends GenericDaoBase implements OvsProviderDao { diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java index fc9eccf6500..235db0cec44 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = PhysicalNetworkDao.class) @DB() public class PhysicalNetworkDaoImpl extends GenericDaoBase implements PhysicalNetworkDao { final SearchBuilder ZoneSearch; diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java index f241a41286a..75c70d14e3a 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = PhysicalNetworkServiceProviderDao.class) @DB() public class PhysicalNetworkServiceProviderDaoImpl extends GenericDaoBase implements PhysicalNetworkServiceProviderDao { final SearchBuilder physicalNetworkSearch; diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java index fe7d49c4015..4811b59d31e 100644 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = PhysicalNetworkTrafficTypeDao.class) @DB() public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase implements PhysicalNetworkTrafficTypeDao { final SearchBuilder physicalNetworkSearch; diff --git a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java index 211280dbe1f..40d5c8eba0f 100644 --- a/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java @@ -21,7 +21,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = PortProfileDao.class) @DB() public class PortProfileDaoImpl extends GenericDaoBase implements PortProfileDao { protected static final Logger s_logger = Logger.getLogger(PortProfileDaoImpl.class); diff --git a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java index 965d4337f59..3aa2e749712 100644 --- a/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ 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/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java index cd8d9e213fa..4db826b6459 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ 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/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java index e32533f6a5c..b55f39ab31b 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnConnectionDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -31,7 +30,6 @@ 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/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java index 658ca0ab407..80465f9ee1e 100644 --- a/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/Site2SiteVpnGatewayDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.dao; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {Site2SiteVpnGatewayDao.class}) public class Site2SiteVpnGatewayDaoImpl extends GenericDaoBase implements Site2SiteVpnGatewayDao { @Inject protected IPAddressDao _addrDao; diff --git a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java index 99354c5dbc2..185c18aecd8 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertDaoImpl.java @@ -18,13 +18,11 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -@Local(value = {SslCertDao.class}) public class SslCertDaoImpl extends GenericDaoBase implements SslCertDao { private final SearchBuilder listByAccountId; diff --git a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java index f0ba19993df..9a7737fe12c 100644 --- a/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = UserIpv6AddressDao.class) public class UserIpv6AddressDaoImpl extends GenericDaoBase implements UserIpv6AddressDao { private static final Logger s_logger = Logger.getLogger(IPAddressDaoImpl.class); diff --git a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java index 4baf0a03c2a..4d995c996c1 100644 --- a/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = VirtualRouterProviderDao.class) @DB() public class VirtualRouterProviderDaoImpl extends GenericDaoBase implements VirtualRouterProviderDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java b/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java index 9f5e1dc8fb5..b8acaf4f6ad 100644 --- a/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ 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; private final SearchBuilder AccountNameSearch; diff --git a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java index 3aa6181ff70..29cba516d72 100644 --- a/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.rules.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ 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 { protected final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java index 78bc128b542..019cf5fec46 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.security.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {SecurityGroupDao.class}) public class SecurityGroupDaoImpl extends GenericDaoBase implements SecurityGroupDao { private SearchBuilder AccountIdSearch; private SearchBuilder AccountIdNameSearch; diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java index f6ea339daef..64c42bf7eca 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.security.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -38,7 +37,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.DB; @Component -@Local(value = {SecurityGroupRuleDao.class}) public class SecurityGroupRuleDaoImpl extends GenericDaoBase implements SecurityGroupRuleDao { @Inject diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java index 05feee1ba83..640536c87eb 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.security.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ 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; private SearchBuilder AccountSearch; diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java index 873d193ce0d..a2ec95ccb67 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.security.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.vm.VirtualMachine.State; @Component -@Local(value = {SecurityGroupVMMapDao.class}) public class SecurityGroupVMMapDaoImpl extends GenericDaoBase implements SecurityGroupVMMapDao { private SearchBuilder ListByIpAndVmId; private SearchBuilder ListByVmId; diff --git a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java index d66590f1e8c..9b0bf088a14 100644 --- a/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.security.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -37,7 +36,6 @@ import com.cloud.utils.db.TransactionLegacy; 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/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java index 8fe9375c051..7620b15b930 100644 --- a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java +++ b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VmRulesetLogDao.class}) public class VmRulesetLogDaoImpl extends GenericDaoBase implements VmRulesetLogDao { protected static final Logger s_logger = Logger.getLogger(VmRulesetLogDaoImpl.class); private SearchBuilder VmIdSearch; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java index bc178d32ff9..00bb1d87c02 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.vpc.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = NetworkACLDao.class) @DB() public class NetworkACLDaoImpl extends GenericDaoBase implements NetworkACLDao { diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java index 4c2574e6094..395c9b20f80 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java @@ -21,7 +21,6 @@ package com.cloud.network.vpc.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -38,7 +37,6 @@ import com.cloud.utils.db.TransactionLegacy; * */ @Component -@Local(value = NetworkACLItemCidrsDao.class) public class NetworkACLItemCidrsDaoImpl extends GenericDaoBase implements NetworkACLItemCidrsDao { private static final Logger s_logger = Logger.getLogger(NetworkACLItemCidrsDaoImpl.class); protected final SearchBuilder cidrsSearch; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java index 15f9014130f..eb957a944ba 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import com.google.common.collect.Lists; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = NetworkACLItemDao.class) @DB() public class NetworkACLItemDaoImpl extends GenericDaoBase implements NetworkACLItemDao { private static final Logger s_logger = Logger.getLogger(NetworkACLItemDaoImpl.class); diff --git a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java index 21784529033..8b090fdfbc8 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.vpc.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = PrivateIpDao.class) @DB() public class PrivateIpDaoImpl extends GenericDaoBase implements PrivateIpDao { private static final Logger s_logger = Logger.getLogger(PrivateIpDaoImpl.class); diff --git a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java index d2c2a731f98..596cf983b20 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = StaticRouteDao.class) @DB() public class StaticRouteDaoImpl extends GenericDaoBase implements StaticRouteDao { protected final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java index b06560d876d..4e13fe4f5d0 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.vpc.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -40,7 +39,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = VpcDao.class) @DB() public class VpcDaoImpl extends GenericDaoBase implements VpcDao { final GenericSearchBuilder CountByOfferingId; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java index 73e7df3cadc..284fd8884c1 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = VpcGatewayDao.class) @DB() public class VpcGatewayDaoImpl extends GenericDaoBase implements VpcGatewayDao { protected final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java index 8ea0a8a8831..15a1cc4dc3a 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.vpc.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = VpcOfferingDao.class) @DB() public class VpcOfferingDaoImpl extends GenericDaoBase implements VpcOfferingDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java index 5f8cbff8b1d..9679c3af7d8 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcOfferingServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = VpcOfferingServiceMapDao.class) @DB() public class VpcOfferingServiceMapDaoImpl extends GenericDaoBase implements VpcOfferingServiceMapDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java index cb7ddec87a5..753c45fcc78 100644 --- a/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.vpc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = VpcServiceMapDao.class) @DB() public class VpcServiceMapDaoImpl extends GenericDaoBase implements VpcServiceMapDao { final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java index caa16d235bf..5a6092ec243 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.offerings.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.EntityExistsException; @@ -41,7 +40,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = NetworkOfferingDao.class) @DB() public class NetworkOfferingDaoImpl extends GenericDaoBase implements NetworkOfferingDao { final SearchBuilder NameSearch; diff --git a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java index e8f5520e357..b667e58b555 100644 --- a/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java +++ b/engine/schema/src/com/cloud/offerings/dao/NetworkOfferingServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.offerings.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = NetworkOfferingServiceMapDao.class) @DB() public class NetworkOfferingServiceMapDaoImpl extends GenericDaoBase implements NetworkOfferingServiceMapDao { diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java index 2ecf3fb8091..ecf1aab6f4f 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectAccountDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.projects.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ 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; final GenericSearchBuilder AdminSearch; diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java index b2cf2d899f6..560f8dc79fd 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.projects.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {ProjectDao.class}) public class ProjectDaoImpl extends GenericDaoBase implements ProjectDao { private static final Logger s_logger = Logger.getLogger(ProjectDaoImpl.class); protected final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java index 0dff4af525a..2fc74b9ee85 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.projects.dao; import java.sql.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ 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); protected final SearchBuilder AllFieldsSearch; diff --git a/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java b/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java index 4421e872ec9..ac438b0d117 100644 --- a/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java +++ b/engine/schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.secstorage; import java.util.Date; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ 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 { protected final SearchBuilder ExpungeSearch; diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java index 4a5a8b5448b..f54c55863ca 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java @@ -21,7 +21,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.persistence.EntityExistsException; @@ -41,7 +40,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.dao.UserVmDetailsDao; @Component -@Local(value = {ServiceOfferingDao.class}) @DB() public class ServiceOfferingDaoImpl extends GenericDaoBase implements ServiceOfferingDao { protected static final Logger s_logger = Logger.getLogger(ServiceOfferingDaoImpl.class); diff --git a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java index 6e504bce13b..fa64389d7ec 100644 --- a/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.service.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.service.ServiceOfferingDetailsVO; @Component -@Local(value = ServiceOfferingDetailsDao.class) public class ServiceOfferingDetailsDaoImpl extends ResourceDetailsDaoBase implements ServiceOfferingDetailsDao { @Override diff --git a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java index ba8406276f6..41993b6b903 100644 --- a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.storage.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import javax.persistence.EntityExistsException; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ 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 final SearchBuilder DomainIdSearch; private final SearchBuilder PrivateDiskOfferingSearch; diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java index c68eebbd50c..8ffb54a9873 100644 --- a/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/GuestOSCategoryDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import com.cloud.storage.GuestOSCategoryVO; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = {GuestOSCategoryDao.class}) public class GuestOSCategoryDaoImpl extends GenericDaoBase implements GuestOSCategoryDao { protected GuestOSCategoryDaoImpl() { diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java index 435976b8ef1..178eab80ecc 100644 --- a/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/GuestOSDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {GuestOSDao.class}) public class GuestOSDaoImpl extends GenericDaoBase implements GuestOSDao { protected final SearchBuilder Search; diff --git a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java index 5a855b29f1d..29471f9637a 100644 --- a/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; import java.util.Date; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {GuestOSHypervisorDao.class}) public class GuestOSHypervisorDaoImpl extends GenericDaoBase implements GuestOSHypervisorDao { protected final SearchBuilder guestOsSearch; diff --git a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java index 3a5c3856523..ec1a3a267c6 100644 --- a/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -39,7 +38,6 @@ import com.cloud.utils.db.TransactionLegacy; 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); private static final String REMOVE_LAUNCH_PERMISSION = "DELETE FROM `cloud`.`launch_permission`" + " WHERE template_id = ? AND account_id = ?"; diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java index ccca9444406..9483f1ca82c 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java @@ -21,7 +21,6 @@ import java.sql.ResultSet; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -51,7 +50,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.VMInstanceDao; @Component -@Local(value = {SnapshotDao.class}) public class SnapshotDaoImpl extends GenericDaoBase implements SnapshotDao { public static final Logger s_logger = Logger.getLogger(SnapshotDaoImpl.class.getName()); // TODO: we should remove these direct sqls diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java index 033a82d5a6f..73b236f17cb 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ 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; private final SearchBuilder VolumeIdIntervalSearch; diff --git a/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java index ddf8b3dfe53..b1e6d12e7bc 100644 --- a/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.storage.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ 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; protected final SearchBuilder coincidingSchedulesSearch; diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java index de7141ffb06..1e74d25632b 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey.Scope; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; -@Local(value = StoragePoolDetailsDao.class) public class StoragePoolDetailsDaoImpl extends ResourceDetailsDaoBase implements StoragePoolDetailsDao, ScopedConfigStorage { public StoragePoolDetailsDaoImpl() { diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java index c1a765737be..2b7b0f7cbe4 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java index 99e96a520fa..d712b03791c 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {StoragePoolWorkDao.class}) @DB() public class StoragePoolWorkDaoImpl extends GenericDaoBase implements StoragePoolWorkDao { diff --git a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java index 191fc4ccfb1..068e1ee91a2 100644 --- a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ 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()); protected final SearchBuilder typeUploadStatusSearch; diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 02fb4b466ed..58922fe3f51 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -63,7 +62,6 @@ import com.cloud.utils.db.UpdateBuilder; 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/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java index 456cdc66433..3e7072f6bf0 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.storage.VMTemplateDetailVO; @Component -@Local(value = VMTemplateDetailsDao.class) public class VMTemplateDetailsDaoImpl extends ResourceDetailsDaoBase implements VMTemplateDetailsDao { @Override diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java index a176881c742..5f7a2d78e2c 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -51,7 +50,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.UpdateBuilder; @Component -@Local(value = {VMTemplateHostDao.class}) public class VMTemplateHostDaoImpl extends GenericDaoBase implements VMTemplateHostDao { public static final Logger s_logger = Logger.getLogger(VMTemplateHostDaoImpl.class.getName()); @Inject diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java index aacd4ffc36a..770e673e88d 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -42,7 +41,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.UpdateBuilder; @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/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java index 8cadf617f0b..bffe2098641 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.storage.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java index f5738477540..e0ae409fa6b 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -53,7 +52,6 @@ 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); protected final SearchBuilder DetachedAccountIdSearch; diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java index 15c020dacb5..09e33ce47e2 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.storage.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.storage.VolumeDetailVO; @Component -@Local(value = VolumeDetailsDao.class) public class VolumeDetailsDaoImpl extends ResourceDetailsDaoBase implements VolumeDetailsDao { @Override diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java index 2820061bac1..ce2251300a2 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.storage.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.UpdateBuilder; @Component -@Local(value = {VolumeHostDao.class}) public class VolumeHostDaoImpl extends GenericDaoBase implements VolumeHostDao { private static final Logger s_logger = Logger.getLogger(VolumeHostDaoImpl.class); protected final SearchBuilder HostVolumeSearch; diff --git a/engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java b/engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java index a6c26243c21..0e23eff900f 100644 --- a/engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java +++ b/engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.tags.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ 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/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java index 2001fae0529..6111fb16cf2 100644 --- a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -37,7 +36,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {SystemIntegrityChecker.class}) public class DatabaseIntegrityChecker extends AdapterBase implements SystemIntegrityChecker { private static final Logger s_logger = Logger.getLogger(DatabaseIntegrityChecker.class); diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java index 0fb2dfe5a90..67fe70fdb29 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java +++ b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -39,7 +38,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = VersionDao.class) @DB() public class VersionDaoImpl extends GenericDaoBase implements VersionDao { private static final Logger s_logger = Logger.getLogger(VersionDaoImpl.class); diff --git a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java index c7182d525a6..67b135b64ef 100644 --- a/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.usage.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ExternalPublicIpStatisticsDao.class}) public class ExternalPublicIpStatisticsDaoImpl extends GenericDaoBase implements ExternalPublicIpStatisticsDao { private final SearchBuilder AccountZoneSearch; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java index 93ddf9bf27a..69ea0fbcbad 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java @@ -30,7 +30,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import javax.ejb.Local; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Types; @@ -40,7 +39,6 @@ import java.util.List; import java.util.TimeZone; @Component -@Local(value = {UsageDao.class}) public class UsageDaoImpl extends GenericDaoBase implements UsageDao { public static final Logger s_logger = Logger.getLogger(UsageDaoImpl.class.getName()); private static final String DELETE_ALL = "DELETE FROM cloud_usage"; diff --git a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java index 358e638b547..a1e64e4cb22 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java index 0a73dd98ced..065dc309ebe 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java @@ -21,7 +21,6 @@ import java.sql.ResultSet; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @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/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java index abace041865..969f0c383ec 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java index 12cbc435e29..8922e1f0aa5 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {UsageNetworkDao.class}) public class UsageNetworkDaoImpl extends GenericDaoBase implements UsageNetworkDao { private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); private static final String SELECT_LATEST_STATS = diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index 2661d4e0ec4..23931f0a84e 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java index d2053e822b6..76d78ceb775 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java index 2305018dc63..f98133f5439 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java index 22522751ca8..8d419e5a62e 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java index 930ad899992..d330267d0b4 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java index 0f02c35be4c..41c4a3a6bbe 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {UsageVMSnapshotDao.class}) public class UsageVMSnapshotDaoImpl extends GenericDaoBase implements UsageVMSnapshotDao { public static final Logger s_logger = Logger.getLogger(UsageVMSnapshotDaoImpl.class.getName()); protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT id, zone_id, account_id, domain_id, vm_id, disk_offering_id, size, created, processed " diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java index e2251dfcd61..9be0ca5d59a 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVPNUserDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java index 4491c6730b9..2b934770b7d 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {UsageVmDiskDao.class}) public class UsageVmDiskDaoImpl extends GenericDaoBase implements UsageVmDiskDao { private static final Logger s_logger = Logger.getLogger(UsageVmDiskDaoImpl.class.getName()); private static final String SELECT_LATEST_STATS = diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java index 7ef4222f928..9b983a53573 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import com.cloud.exception.CloudException; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @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/engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java b/engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java index 9bdaff60309..c8675d874ad 100644 --- a/engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/AccountDetailsDaoImpl.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey.Scope; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; -@Local(value = {AccountDetailsDao.class}) public class AccountDetailsDaoImpl extends GenericDaoBase implements AccountDetailsDao, ScopedConfigStorage { protected final SearchBuilder accountSearch; diff --git a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java index 9ae279fe5f0..bff6213c10b 100644 --- a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java @@ -21,7 +21,6 @@ import java.sql.ResultSet; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -42,7 +41,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {AccountDao.class}) public class AccountDaoImpl extends GenericDaoBase implements AccountDao { private static final Logger s_logger = Logger.getLogger(AccountDaoImpl.class); private static final String FIND_USER_ACCOUNT_BY_API_KEY = "SELECT u.id, u.username, u.account_id, u.secret_key, u.state, " diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java index 51e5fbeefd4..1a773ce926b 100644 --- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.user.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {SSHKeyPairDao.class}) public class SSHKeyPairDaoImpl extends GenericDaoBase implements SSHKeyPairDao { @Override diff --git a/engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java b/engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java index a8d9e39a63c..e0cf48d44a8 100644 --- a/engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/UserAccountDaoImpl.java @@ -23,11 +23,9 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import org.springframework.stereotype.Component; -import javax.ejb.Local; import java.util.List; @Component -@Local(value = {UserAccountDao.class}) public class UserAccountDaoImpl extends GenericDaoBase implements UserAccountDao { protected final SearchBuilder userAccountSearch; diff --git a/engine/schema/src/com/cloud/user/dao/UserDaoImpl.java b/engine/schema/src/com/cloud/user/dao/UserDaoImpl.java index 6ac398d81c2..e15cf803c1d 100644 --- a/engine/schema/src/com/cloud/user/dao/UserDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/UserDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.user.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {UserDao.class}) @DB public class UserDaoImpl extends GenericDaoBase implements UserDao { protected SearchBuilder UsernamePasswordSearch; diff --git a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java b/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java index 7a8e714dc77..acadc2f0908 100644 --- a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {UserStatisticsDao.class}) public class UserStatisticsDaoImpl extends GenericDaoBase implements UserStatisticsDao { private static final Logger s_logger = Logger.getLogger(UserStatisticsDaoImpl.class); private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = diff --git a/engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java b/engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java index 3974e6e6199..ab1151e4f32 100644 --- a/engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.user.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ 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/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java b/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java index 56a1d3e5197..34fa2e79e98 100644 --- a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VmDiskStatisticsDao.class}) public class VmDiskStatisticsDaoImpl extends GenericDaoBase implements VmDiskStatisticsDao { private static final Logger s_logger = Logger.getLogger(VmDiskStatisticsDaoImpl.class); private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = diff --git a/engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java b/engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java index 862df50bfab..ff727904dcb 100644 --- a/engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.vm; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ 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; protected final SearchBuilder CleanupSearch; diff --git a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java index 210300fb232..36ff74b11b3 100644 --- a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -40,7 +39,6 @@ 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/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java index c2d6dfe8d8e..271644f8362 100644 --- a/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/DomainRouterDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.commons.collections.CollectionUtils; @@ -50,7 +49,6 @@ import com.cloud.vm.DomainRouterVO; import com.cloud.vm.VirtualMachine.State; @Component -@Local(value = {DomainRouterDao.class}) @DB public class DomainRouterDaoImpl extends GenericDaoBase implements DomainRouterDao { diff --git a/engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java index 56501bd19a5..548b3af17a4 100644 --- a/engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.vm.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ 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; protected final SearchBuilder AccountSearch; diff --git a/engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java index 27a4113e83a..3366f5647ec 100644 --- a/engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.vm.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.InstanceGroupVMMapVO; @Component -@Local(value = {InstanceGroupVMMapDao.class}) public class InstanceGroupVMMapDaoImpl extends GenericDaoBase implements InstanceGroupVMMapDao { private SearchBuilder ListByVmId; diff --git a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java index da89b2c54d3..027670b1164 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java @@ -20,7 +20,6 @@ import java.net.URI; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -39,7 +38,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; @Component -@Local(value = NicDao.class) public class NicDaoImpl extends GenericDaoBase implements NicDao { private SearchBuilder AllFieldsSearch; private GenericSearchBuilder IpSearch; diff --git a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java index 2bad56d2625..2a0b02aae1d 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.vm.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.vm.NicDetailVO; @Component -@Local(value = {NicDetailsDao.class}) public class NicDetailsDaoImpl extends ResourceDetailsDaoBase implements NicDetailsDao { @Override diff --git a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java index a267218008a..780bcdda311 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicIpAliasDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.vm.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.vm.NicIpAlias; @Component -@Local(value = NicIpAliasDao.class) public class NicIpAliasDaoImpl extends GenericDaoBase implements NicIpAliasDao { private final SearchBuilder AllFieldsSearch; private final GenericSearchBuilder IpSearch; diff --git a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java index 29af0198b47..8cd61953a73 100644 --- a/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/NicSecondaryIpDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.vm.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NicSecondaryIpDao.class) public class NicSecondaryIpDaoImpl extends GenericDaoBase implements NicSecondaryIpDao { private final SearchBuilder AllFieldsSearch; private final GenericSearchBuilder IpSearch; diff --git a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java index 8cd8a4abc8c..2b3c0289b23 100644 --- a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -38,7 +37,6 @@ 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/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java index 3007810d454..d76f6d46d4e 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.vm.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.vm.UserVmCloneSettingVO; @Component -@Local(value = {UserVmCloneSettingDao.class}) @DB() public class UserVmCloneSettingDaoImpl extends GenericDaoBase implements UserVmCloneSettingDao { public static final Logger s_logger = Logger.getLogger(UserVmCloneSettingDaoImpl.class); diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java index 1f2843d144f..b1ff7060ba1 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Set; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -53,7 +52,6 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmData.NicData; import com.cloud.vm.dao.UserVmData.SecurityGroupData; -@Local(value = {UserVmDao.class}) public class UserVmDaoImpl extends GenericDaoBase implements UserVmDao { public static final Logger s_logger = Logger.getLogger(UserVmDaoImpl.class); diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java index 5800cd5f914..d8f751842d5 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.vm.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -25,7 +24,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import com.cloud.vm.UserVmDetailVO; @Component -@Local(value = UserVmDetailsDao.class) public class UserVmDetailsDaoImpl extends ResourceDetailsDaoBase implements UserVmDetailsDao { @Override diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java index d58ff9e3b91..1fe2b3f2d9c 100644 --- a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -63,7 +62,6 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.Type; @Component -@Local(value = {VMInstanceDao.class}) public class VMInstanceDaoImpl extends GenericDaoBase implements VMInstanceDao { public static final Logger s_logger = Logger.getLogger(VMInstanceDaoImpl.class); diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java index a87d284dc12..1b1842dfd89 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java @@ -20,7 +20,6 @@ package com.cloud.vm.snapshot.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.vm.snapshot.VMSnapshot.State; import com.cloud.vm.snapshot.VMSnapshotVO; @Component -@Local(value = {VMSnapshotDao.class}) public class VMSnapshotDaoImpl extends GenericDaoBase implements VMSnapshotDao { private static final Logger s_logger = Logger.getLogger(VMSnapshotDaoImpl.class); private final SearchBuilder SnapshotSearch; diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java index c63b04b4e74..d3f11633e00 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.affinity.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.acl.ControlledEntity; @@ -32,7 +31,6 @@ import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -@Local(value = {AffinityGroupDao.class}) public class AffinityGroupDaoImpl extends GenericDaoBase implements AffinityGroupDao { private SearchBuilder AccountIdSearch; private SearchBuilder AccountIdNameSearch; diff --git a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java index aac67ec0525..f66f1264697 100644 --- a/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.affinity.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; @@ -35,7 +34,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.TransactionLegacy; -@Local(value = {AffinityGroupVMMapDao.class}) public class AffinityGroupVMMapDaoImpl extends GenericDaoBase implements AffinityGroupVMMapDao { private SearchBuilder ListByVmId; private SearchBuilder ListByVmIdGroupId; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java index 813a1a4d3e2..7f2410e6ba0 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VMComputeTagDao.class}) public class VMComputeTagDaoImpl extends GenericDaoBase implements VMComputeTagDao { protected SearchBuilder VmIdSearch; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java index 6df243b7122..13278a75dd4 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VMEntityDao.class}) public class VMEntityDaoImpl extends GenericDaoBase implements VMEntityDao { public static final Logger s_logger = Logger.getLogger(VMEntityDaoImpl.class); diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java index 5e683e147f7..bb26d382ef7 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VMNetworkMapDao.class}) public class VMNetworkMapDaoImpl extends GenericDaoBase implements VMNetworkMapDao { protected SearchBuilder VmIdSearch; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java index 69d72f152a9..871425bb78b 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VMReservationDao.class}) public class VMReservationDaoImpl extends GenericDaoBase implements VMReservationDao { protected SearchBuilder VmIdSearch; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java index 3e35150bae6..3e4eaf1c9aa 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {VMRootDiskTagDao.class}) public class VMRootDiskTagDaoImpl extends GenericDaoBase implements VMRootDiskTagDao { protected SearchBuilder VmIdSearch; diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java index b864b75e7a8..7069594d166 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.engine.cloud.entity.api.db.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {VolumeReservationDao.class}) public class VolumeReservationDaoImpl extends GenericDaoBase implements VolumeReservationDao { protected SearchBuilder VmIdSearch; diff --git a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java b/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java index 9a1b5a03655..7d87ce1540d 100644 --- a/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.lb.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -37,7 +36,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.net.Ip; @Component -@Local(value = {ApplicationLoadBalancerRuleDao.class}) public class ApplicationLoadBalancerRuleDaoImpl extends GenericDaoBase implements ApplicationLoadBalancerRuleDao { protected final SearchBuilder AllFieldsSearch; final GenericSearchBuilder listIps; diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java index 08717748f41..72982c4dde0 100644 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpDaoImpl.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.region; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {PortableIpDao.class}) public class PortableIpDaoImpl extends GenericDaoBase implements PortableIpDao { private final SearchBuilder listByRegionIDSearch; diff --git a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java index e9fdb000a39..bd22afc4186 100644 --- a/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.region; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {PortableIpRangeDao.class}) public class PortableIpRangeDaoImpl extends GenericDaoBase implements PortableIpRangeDao { private final SearchBuilder listByRegionIDSearch; diff --git a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java index d7f102d6059..e2ad5d9ed23 100644 --- a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.region.dao; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {RegionDao.class}) public class RegionDaoImpl extends GenericDaoBase implements RegionDao { private static final Logger s_logger = Logger.getLogger(RegionDaoImpl.class); protected SearchBuilder NameSearch; diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java index 6676fa0ee8c..afd0f3c1dbb 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.region.gslb; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {GlobalLoadBalancerRuleDao.class}) public class GlobalLoadBalancerDaoImpl extends GenericDaoBase implements GlobalLoadBalancerRuleDao { private final SearchBuilder listByDomainSearch; diff --git a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java index 77f20d74e7b..d0cf220aa53 100644 --- a/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.region.gslb; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {GlobalLoadBalancerLbRuleMapDao.class}) @DB() public class GlobalLoadBalancerLbRuleMapDaoImpl extends GenericDaoBase implements GlobalLoadBalancerLbRuleMapDao { diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java index 3d32a680cf9..8c3552dc42c 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmGroupDetailsDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.AutoScaleVmGroupDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; @Component -@Local(value = {AutoScaleVmGroupDetailsDao.class}) public class AutoScaleVmGroupDetailsDaoImpl extends ResourceDetailsDaoBase implements AutoScaleVmGroupDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java index 736acefb4b2..f5f24830132 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.AutoScaleVmProfileDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; @Component -@Local(value = {AutoScaleVmProfileDetailsDao.class}) public class AutoScaleVmProfileDetailsDaoImpl extends ResourceDetailsDaoBase implements AutoScaleVmProfileDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java index c7c7e6cadce..f13cc7bf8d8 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/DiskOfferingDetailsDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.DiskOfferingDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; @Component -@Local(value = {DiskOfferingDetailsDao.class}) public class DiskOfferingDetailsDaoImpl extends ResourceDetailsDaoBase implements DiskOfferingDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java index fa904932530..fa2692eca40 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/FirewallRuleDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.FirewallRuleDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; @Component -@Local(value = {FirewallRuleDetailsDao.class}) public class FirewallRuleDetailsDaoImpl extends ResourceDetailsDaoBase implements FirewallRuleDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java index ab2e07f50d1..7c921619c9f 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBHealthCheckPolicyDetailsDaoImpl.java @@ -12,14 +12,12 @@ // Automatically generated by addcopyright.py at 04/03/2012 package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.LBHealthCheckPolicyDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; @Component -@Local(value = {LBHealthCheckPolicyDetailsDao.class}) public class LBHealthCheckPolicyDetailsDaoImpl extends ResourceDetailsDaoBase implements LBHealthCheckPolicyDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java index a9afa2280c2..a2604e5d414 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/LBStickinessPolicyDetailsDaoImpl.java @@ -12,14 +12,12 @@ // Automatically generated by addcopyright.py at 04/03/2012 package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.LBStickinessPolicyDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.springframework.stereotype.Component; @Component -@Local(value = {LBStickinessPolicyDetailsDao.class}) public class LBStickinessPolicyDetailsDaoImpl extends ResourceDetailsDaoBase implements LBStickinessPolicyDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java index d8686a21bfb..655fe8bfca6 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLItemDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.NetworkACLItemDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; @Component -@Local(value = {NetworkACLItemDetailsDao.class}) public class NetworkACLItemDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkACLItemDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java index b204ce2246f..d25bb60e7cb 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/NetworkACLListDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.NetworkACLListDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; @Component -@Local(value = {NetworkACLListDetailsDao.class}) public class NetworkACLListDetailsDaoImpl extends ResourceDetailsDaoBase implements NetworkACLListDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java index 125369be6a9..a71b006254e 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.RemoteAccessVpnDetailVO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; @Component -@Local(value = {RemoteAccessVpnDetailsDao.class}) public class RemoteAccessVpnDetailsDaoImpl extends ResourceDetailsDaoBase implements RemoteAccessVpnDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java index 73650fe48f3..dcaaa6a978f 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteCustomerGatewayDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.Site2SiteCustomerGatewayDetailVO; @Component -@Local(value = {Site2SiteCustomerGatewayDetailsDao.class}) public class Site2SiteCustomerGatewayDetailsDaoImpl extends ResourceDetailsDaoBase implements Site2SiteCustomerGatewayDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java index 099977d46b2..cd42b6667e6 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java @@ -15,14 +15,12 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.Site2SiteVpnConnectionDetailVO; import org.springframework.stereotype.Component; @Component -@Local(value = {Site2SiteVpnConnectionDetailsDao.class}) public class Site2SiteVpnConnectionDetailsDaoImpl extends ResourceDetailsDaoBase implements Site2SiteVpnConnectionDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java index 9502b65460b..81b47c93a11 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.Site2SiteVpnGatewayDetailVO; @Component -@Local(value = { Site2SiteVpnGatewayDetailsDao.class }) public class Site2SiteVpnGatewayDetailsDaoImpl extends ResourceDetailsDaoBase implements Site2SiteVpnGatewayDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java index 88e21d6c55a..65e23115b92 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.SnapshotPolicyDetailVO; @Component -@Local(value = {SnapshotPolicyDetailsDao.class}) public class SnapshotPolicyDetailsDaoImpl extends ResourceDetailsDaoBase implements SnapshotPolicyDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java index d77ee873d26..05b3c845bbe 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.UserDetailVO; import org.springframework.stereotype.Component; @Component -@Local(value = {UserDetailsDao.class}) public class UserDetailsDaoImpl extends ResourceDetailsDaoBase implements UserDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java index 4444da0faf9..dd6097de43a 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/UserIpAddressDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.UserIpAddressDetailVO; @Component -@Local(value = {UserIpAddressDetailsDao.class}) public class UserIpAddressDetailsDaoImpl extends ResourceDetailsDaoBase implements UserIpAddressDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java index b455656cae3..60e62d18ab5 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.VpcDetailVO; @Component -@Local(value = {VpcDetailsDao.class}) public class VpcDetailsDaoImpl extends ResourceDetailsDaoBase implements VpcDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java index e8d632dd24a..3aed6160f11 100644 --- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.resourcedetail.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -24,7 +23,6 @@ import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; import org.apache.cloudstack.resourcedetail.VpcGatewayDetailVO; @Component -@Local(value = {VpcGatewayDetailsDao.class}) public class VpcGatewayDetailsDaoImpl extends ResourceDetailsDaoBase implements VpcGatewayDetailsDao { @Override diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java index 5f98f908196..fd617cce09c 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -46,7 +45,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; -@Local(value = {PrimaryDataStoreDao.class}) @DB() public class PrimaryDataStoreDaoImpl extends GenericDaoBase implements PrimaryDataStoreDao { protected final SearchBuilder AllFieldSearch; diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java index c4ed2c73f1d..b040c74c28c 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java @@ -21,11 +21,9 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -40,7 +38,6 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = StoragePoolAllocator.class) public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(ClusterScopeStoragePoolAllocator.class); diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java index 761c3a8eabc..b3a1c0d4b10 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.storage.allocator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -36,7 +35,6 @@ import com.cloud.utils.component.ComponentContext; import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; -@Local(value = StoragePoolAllocator.class) public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(GarbageCollectingStoragePoolAllocator.class); diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java index a4edf76c105..094903658da 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java @@ -21,11 +21,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.log4j.Logger; @@ -45,7 +43,6 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; @Component -@Local(value = StoragePoolAllocator.class) public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { private static final Logger s_logger = Logger.getLogger(LocalStoragePoolAllocator.class); diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java index bb59a8cc584..e552a1bf2ca 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/UseLocalForRootAllocator.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.storage.allocator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -33,7 +32,6 @@ import com.cloud.storage.StoragePool; import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; -@Local(value = StoragePoolAllocator.class) public class UseLocalForRootAllocator extends LocalStoragePoolAllocator implements StoragePoolAllocator { @Inject diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java index 56feb26e6bc..2bfc38e6c82 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = ImageStoreDetailsDao.class) public class ImageStoreDetailsDaoImpl extends GenericDaoBase implements ImageStoreDetailsDao { protected final SearchBuilder storeSearch; diff --git a/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java index 3860ad45514..0b14be8be0d 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.cluster; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -29,7 +28,6 @@ import org.springframework.stereotype.Component; import com.cloud.utils.component.ManagerBase; @Component -@Local(value = {ClusterFenceManager.class}) public class ClusterFenceManagerImpl extends ManagerBase implements ClusterFenceManager, ClusterManagerListener { private static final Logger s_logger = Logger.getLogger(ClusterFenceManagerImpl.class); diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java index ecf3aacb0b8..2e20f241e01 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java @@ -37,7 +37,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -68,7 +67,6 @@ import com.cloud.utils.exception.ExceptionUtil; import com.cloud.utils.mgmt.JmxUtil; import com.cloud.utils.net.NetUtils; -@Local(value = {ClusterManager.class}) public class ClusterManagerImpl extends ManagerBase implements ClusterManager, Configurable { private static final Logger s_logger = Logger.getLogger(ClusterManagerImpl.class); diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java b/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java index ce4667ecc00..3ab4d97ee05 100644 --- a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java +++ b/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -41,7 +40,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; -@Local(value = {ManagementServerHostDao.class}) public class ManagementServerHostDaoImpl extends GenericDaoBase implements ManagementServerHostDao { private static final Logger s_logger = Logger.getLogger(ManagementServerHostDaoImpl.class); diff --git a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java b/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java index c0c6334942e..a43fcfc8d30 100644 --- a/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java +++ b/framework/cluster/src/com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.cluster.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; -@Local(value = {ManagementServerHostPeerDao.class}) public class ManagementServerHostPeerDaoImpl extends GenericDaoBase implements ManagementServerHostPeerDao { private static final Logger s_logger = Logger.getLogger(ManagementServerHostPeerDaoImpl.class); diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java index 65bad9c44a7..fc44c8b2a44 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; @@ -39,7 +38,6 @@ import com.cloud.utils.db.TransactionLegacy; 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); private Map _configs = null; diff --git a/framework/db/src/com/cloud/dao/EntityManagerImpl.java b/framework/db/src/com/cloud/dao/EntityManagerImpl.java index b531d1a646c..40bc5ebd6fe 100644 --- a/framework/db/src/com/cloud/dao/EntityManagerImpl.java +++ b/framework/db/src/com/cloud/dao/EntityManagerImpl.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import net.sf.ehcache.Cache; @@ -33,7 +32,6 @@ import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -@Local(value = EntityManager.class) @SuppressWarnings("unchecked") public class EntityManagerImpl extends ManagerBase implements EntityManager { String _name; diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java index 0ec3c72cf24..c93d31f8ead 100644 --- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java +++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java @@ -23,13 +23,11 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import org.springframework.stereotype.Component; -import javax.ejb.Local; import java.util.Collections; import java.util.Comparator; import java.util.List; @Component -@Local(value = {KeystoreDao.class}) public class KeystoreDaoImpl extends GenericDaoBase implements KeystoreDao { protected final SearchBuilder FindByNameSearch; protected final SearchBuilder CertChainSearch; diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java index 374c080413f..ed8195e2e8f 100644 --- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java +++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.commons.lang.StringUtils; @@ -41,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.security.CertificateHelper; @Component -@Local(value = KeystoreManager.class) public class KeystoreManagerImpl extends ManagerBase implements KeystoreManager { private static final Logger s_logger = Logger.getLogger(KeystoreManagerImpl.class); diff --git a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java index 4383b4573f9..9221ea4c786 100644 --- a/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java +++ b/plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -40,7 +39,6 @@ import com.cloud.utils.component.PluggableService; // This is the default API access checker that grab's the user's account // based on the account type, access is granted -@Local(value = APIChecker.class) public class StaticRoleBasedAPIAccessChecker extends AdapterBase implements APIChecker { protected static final Logger s_logger = Logger.getLogger(StaticRoleBasedAPIAccessChecker.class); diff --git a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java index 9aad5f49972..905890493d2 100644 --- a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java +++ b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.affinity.dao.AffinityGroupDao; @@ -55,7 +54,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = AffinityGroupProcessor.class) public class ExplicitDedicationProcessor extends AffinityProcessorBase implements AffinityGroupProcessor { private static final Logger s_logger = Logger.getLogger(ExplicitDedicationProcessor.class); diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java b/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java index 0504dc63e0d..0af118ff548 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java +++ b/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.affinity; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -44,7 +43,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = AffinityGroupProcessor.class) public class HostAntiAffinityProcessor extends AffinityProcessorBase implements AffinityGroupProcessor { private static final Logger s_logger = Logger.getLogger(HostAntiAffinityProcessor.class); diff --git a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java index cb691a9c8ed..3408a77b850 100644 --- a/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java +++ b/plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -53,7 +52,6 @@ import com.cloud.utils.component.ComponentLifecycleBase; import com.cloud.utils.component.PluggableService; @Component -@Local(value = ApiDiscoveryService.class) public class ApiDiscoveryServiceImpl extends ComponentLifecycleBase implements ApiDiscoveryService { private static final Logger s_logger = Logger.getLogger(ApiDiscoveryServiceImpl.class); diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java index b46dc15b7e4..e35a332c54d 100644 --- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java +++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -45,7 +44,6 @@ import com.cloud.user.User; import com.cloud.utils.component.AdapterBase; @Component -@Local(value = APIChecker.class) public class ApiRateLimitServiceImpl extends AdapterBase implements APIChecker, ApiRateLimitService { private static final Logger s_logger = Logger.getLogger(ApiRateLimitServiceImpl.class); diff --git a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java b/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java index a95272a67bf..fbda65433a2 100644 --- a/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java +++ b/plugins/api/solidfire-intg-test/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.List; import java.util.ArrayList; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -53,7 +52,6 @@ import com.cloud.user.User; import com.cloud.utils.component.AdapterBase; @Component -@Local(value = APIChecker.class) public class ApiSolidFireServiceImpl extends AdapterBase implements APIChecker, ApiSolidFireService { // private static final Logger s_logger = Logger.getLogger(ApiSolidFireServiceImpl.class); diff --git a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java index 9500cac7a75..24d86b0dfea 100644 --- a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java +++ b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -41,7 +40,6 @@ import com.cloud.utils.NumbersUtil; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachineProfile; -@Local(value = DeploymentPlanner.class) public class ImplicitDedicationPlanner extends FirstFitPlanner implements DeploymentClusterPlanner { private static final Logger s_logger = Logger.getLogger(ImplicitDedicationPlanner.class); 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 df6531e8abd..40216ae467e 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 @@ -20,14 +20,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.log4j.Logger; import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachineProfile; -@Local(value = DeploymentPlanner.class) public class UserConcentratedPodPlanner extends FirstFitPlanner implements DeploymentClusterPlanner { private static final Logger s_logger = Logger.getLogger(UserConcentratedPodPlanner.class); 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 5df4d13756d..fb1cceb5a83 100644 --- a/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java +++ b/plugins/deployment-planners/user-dispersing/src/com/cloud/deploy/UserDispersingPlanner.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -33,7 +32,6 @@ import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachineProfile; -@Local(value = DeploymentPlanner.class) public class UserDispersingPlanner extends FirstFitPlanner implements DeploymentClusterPlanner { private static final Logger s_logger = Logger.getLogger(UserDispersingPlanner.class); diff --git a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java b/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java index fd2f9f357f3..3e8d0d0ac8a 100644 --- a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java +++ b/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -37,7 +36,6 @@ import org.apache.cloudstack.framework.events.EventTopic; import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; -@Local(value = EventBus.class) public class InMemoryEventBus extends ManagerBase implements EventBus { private static final Logger s_logger = Logger.getLogger(InMemoryEventBus.class); diff --git a/plugins/event-bus/kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java b/plugins/event-bus/kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java index 6d943dfaba3..17a58a5d232 100644 --- a/plugins/event-bus/kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java +++ b/plugins/event-bus/kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.UUID; import java.util.Properties; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -44,7 +43,6 @@ import org.apache.kafka.clients.producer.ProducerRecord; import com.cloud.utils.PropertiesUtil; -@Local(value = EventBus.class) public class KafkaEventBus extends ManagerBase implements EventBus { public static final String DEFAULT_TOPIC = "cloudstack"; diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java index e53d2e9ad88..eb989dd2871 100644 --- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java +++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java @@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -53,7 +52,6 @@ import org.apache.cloudstack.managed.context.ManagedContextRunnable; import com.cloud.utils.Ternary; import com.cloud.utils.component.ManagerBase; -@Local(value = EventBus.class) public class RabbitMQEventBus extends ManagerBase implements EventBus { // details of AMQP server 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 510e6c6b260..c226ffeb260 100644 --- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java +++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -62,7 +61,6 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {NetappManager.class}) public class NetappManagerImpl extends ManagerBase implements NetappManager { public enum Algorithm { roundrobin, leastfull 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 60a15b58789..58f2ea13edd 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 @@ -18,7 +18,6 @@ package com.cloud.netapp.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ 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 4ac76df8f7c..03352d25785 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 @@ -18,7 +18,6 @@ package com.cloud.netapp.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ 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 e239b1ec560..70db5bc66a9 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 @@ -18,7 +18,6 @@ package com.cloud.netapp.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component(value = "netappVolumeDaoImpl") -@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/ha-planners/skip-heurestics/src/com/cloud/deploy/SkipHeuresticsPlanner.java b/plugins/ha-planners/skip-heurestics/src/com/cloud/deploy/SkipHeuresticsPlanner.java index b67d112f825..598cea674c8 100644 --- a/plugins/ha-planners/skip-heurestics/src/com/cloud/deploy/SkipHeuresticsPlanner.java +++ b/plugins/ha-planners/skip-heurestics/src/com/cloud/deploy/SkipHeuresticsPlanner.java @@ -20,12 +20,10 @@ import com.cloud.vm.VirtualMachineProfile; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.naming.ConfigurationException; import java.util.List; import java.util.Map; -@Local(value=HAPlanner.class) public class SkipHeuresticsPlanner extends FirstFitPlanner implements HAPlanner { private static final Logger s_logger = Logger.getLogger(SkipHeuresticsPlanner.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 390a8afd089..1b373f7e73d 100644 --- 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 @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -40,7 +39,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = HostAllocator.class) public class RandomAllocator extends AdapterBase implements HostAllocator { private static final Logger s_logger = Logger.getLogger(RandomAllocator.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java index 5b4a2c960f9..aa7b2c09de7 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java @@ -18,7 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = BaremetalDhcpDao.class) @DB() public class BaremetalDhcpDaoImpl extends GenericDaoBase implements BaremetalDhcpDao { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java index 0122fa9c514..a2198511bcc 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java @@ -18,7 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.database; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = {BaremetalPxeDao.class}) @DB() public class BaremetalPxeDaoImpl extends GenericDaoBase implements BaremetalPxeDao { } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java index 8b4b45348fd..98ab514e4e7 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -61,7 +60,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = Discoverer.class) public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { protected static final Logger s_logger = Logger.getLogger(BareMetalDiscoverer.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java index 8f439cdc1dd..3213198e3f1 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java @@ -25,7 +25,6 @@ package com.cloud.baremetal.manager; import java.util.HashMap; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -41,7 +40,6 @@ import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = HypervisorGuru.class) public class BareMetalGuru extends HypervisorGuruBase implements HypervisorGuru { private static final Logger s_logger = Logger.getLogger(BareMetalGuru.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java index 2f93ec7d819..b33f3f250fe 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalPlanner.java @@ -19,7 +19,6 @@ package com.cloud.baremetal.manager; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -51,7 +50,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = DeploymentPlanner.class) public class BareMetalPlanner extends AdapterBase implements DeploymentPlanner { private static final Logger s_logger = Logger.getLogger(BareMetalPlanner.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java index 17dab005874..53683fd01b7 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java @@ -46,12 +46,10 @@ import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.util.Date; import java.util.List; -@Local(value = TemplateAdapter.class) public class BareMetalTemplateAdapter extends TemplateAdapterBase implements TemplateAdapter { private final static Logger s_logger = Logger.getLogger(BareMetalTemplateAdapter.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java index f826ae91fde..b1aafc692ef 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -46,7 +45,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; -@Local(value = {BaremetalManager.class}) public class BaremetalManagerImpl extends ManagerBase implements BaremetalManager, StateListener { private static final Logger s_logger = Logger.getLogger(BaremetalManagerImpl.class); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java index 5ad48dc7493..fc7596a9dd6 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.AddBaremetalPxeCmd; @@ -68,7 +67,6 @@ import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = BaremetalPxeService.class) public class BareMetalPingServiceImpl extends BareMetalPxeServiceBase implements BaremetalPxeService { private static final Logger s_logger = Logger.getLogger(BareMetalPingServiceImpl.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index 5ef861d8139..65fea092893 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -74,14 +74,12 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.naming.ConfigurationException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -@Local(value = ServerResource.class) public class BareMetalResourceBase extends ManagerBase implements ServerResource { private static final Logger s_logger = Logger.getLogger(BareMetalResourceBase.class); protected String _uuid; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java index 292e6ef051d..e1477926091 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java @@ -18,7 +18,6 @@ // Automatically generated by addcopyright.py at 01/29/2013 package com.cloud.baremetal.networkservice; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.ApiConstants; @@ -49,7 +48,6 @@ import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.IPAddressVO; import com.cloud.network.guru.DirectPodBasedNetworkGuru; -import com.cloud.network.guru.NetworkGuru; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallbackNoReturn; @@ -58,7 +56,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkGuru.class}) public class BaremetaNetworkGuru extends DirectPodBasedNetworkGuru { private static final Logger s_logger = Logger.getLogger(BaremetaNetworkGuru.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java index 5f2c7466b0f..77f77dd93d6 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -44,7 +43,6 @@ import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.element.DhcpServiceProvider; -import com.cloud.network.element.NetworkElement; import com.cloud.offering.NetworkOffering; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.db.DB; @@ -57,7 +55,6 @@ import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; -@Local(value = NetworkElement.class) public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProvider { private static final Logger s_logger = Logger.getLogger(BaremetalDhcpElement.class); private static final Map> capabilities; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java index c2182e19d81..f50681abe7b 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java @@ -28,7 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -75,7 +74,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; -@Local(value = {BaremetalDhcpManager.class}) public class BaremetalDhcpManagerImpl extends ManagerBase implements BaremetalDhcpManager, ResourceStateAdapter { private static final org.apache.log4j.Logger s_logger = Logger.getLogger(BaremetalDhcpManagerImpl.class); protected String _name; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java index beffa3e7fcc..1bbf1322b1c 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd; @@ -80,7 +79,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; -@Local(value = BaremetalPxeService.class) public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase implements BaremetalPxeService { private static final Logger s_logger = Logger.getLogger(BaremetalKickStartServiceImpl.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java index da2866896da..17ec9021016 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java @@ -53,13 +53,11 @@ import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.VMInstanceDao; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.util.HashMap; import java.util.Map; import java.util.Set; -@Local(value = NetworkElement.class) public class BaremetalPxeElement extends AdapterBase implements NetworkElement { private static final Logger s_logger = Logger.getLogger(BaremetalPxeElement.class); private static final Map> capabilities; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java index e99292a6436..ea3245ccdcb 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -71,7 +70,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.UserVmDao; -@Local(value = {BaremetalPxeManager.class}) public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxeManager, ResourceStateAdapter { private static final org.apache.log4j.Logger s_logger = Logger.getLogger(BaremetalPxeManagerImpl.class); @Inject diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java index 4689fbc8f85..b00d49068c9 100644 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.dc.DataCenter.NetworkType; @@ -45,7 +44,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkElement.class) public class BaremetalUserdataElement extends AdapterBase implements NetworkElement, UserDataServiceProvider { private static Map> capabilities; diff --git a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java index 634f242bfe7..222286f9165 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java @@ -20,7 +20,6 @@ package com.cloud.ha; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.hypervisor.Hypervisor; import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; -@Local(value=Investigator.class) public class HypervInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(HypervInvestigator.class); @Inject HostDao _hostDao; diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java index c9281240913..fd8db4a5644 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Random; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -72,7 +71,6 @@ import com.cloud.storage.StorageLayer; * HypervDirectConnectResource corresponding to the agent on a Hyper-V * hypervisor and manages its lifecycle. */ -@Local(value = Discoverer.class) public class HypervServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(HypervServerDiscoverer.class); Random _rand = new Random(System.currentTimeMillis()); diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java index f000324f724..716fdc2289b 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java @@ -22,7 +22,6 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.api.to.NicTO; @@ -47,7 +46,6 @@ import com.cloud.vm.VirtualMachineProfile; /** * Implementation of Hypervisor guru for Hyper-V. **/ -@Local(value = HypervisorGuru.class) public class HypervGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject diff --git a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java index 000d37ce157..32388df6a70 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java +++ b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java @@ -30,11 +30,9 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.util.List; -@Local(value = Investigator.class) public class KVMInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(KVMInvestigator.class); @Inject 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 b72004038c2..46e15283811 100644 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -53,7 +52,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.ssh.SSHCmdHelper; -@Local(value = Discoverer.class) public class OvmDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(OvmDiscoverer.class); protected String _publicNetworkDevice; 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 a4276a4c84f..e671a364da6 100644 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java @@ -19,7 +19,6 @@ package com.cloud.ovm.hypervisor; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -39,7 +38,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value = FenceBuilder.class) public class OvmFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(OvmFencer.class); @Inject 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 90e4b5742b6..1978ef17823 100644 --- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java +++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java @@ -18,7 +18,6 @@ package com.cloud.ovm.hypervisor; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.api.to.VirtualMachineTO; @@ -29,7 +28,6 @@ import com.cloud.storage.GuestOSVO; import com.cloud.storage.dao.GuestOSDao; import com.cloud.vm.VirtualMachineProfile; -@Local(value = HypervisorGuru.class) public class OvmGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java index f9e88c0b57c..b7feb1ab23b 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java @@ -19,7 +19,6 @@ package com.cloud.ha; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -35,7 +34,6 @@ import com.cloud.hypervisor.Hypervisor; import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; -@Local(value = Investigator.class) public class Ovm3Investigator extends AdapterBase implements Investigator { private static final Logger LOGGER = Logger.getLogger(Ovm3Investigator.class); @Inject diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java index 5dab20abbd7..4743600d509 100755 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -65,7 +64,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.ssh.SSHCmdHelper; -@Local(value = Discoverer.class) public class Ovm3Discoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger LOGGER = Logger.getLogger(Ovm3Discoverer.class); diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3FenceBuilder.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3FenceBuilder.java index c997a589623..95ef97deda8 100755 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3FenceBuilder.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3FenceBuilder.java @@ -20,7 +20,6 @@ package com.cloud.hypervisor.ovm3.resources; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -40,7 +39,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value = FenceBuilder.class) public class Ovm3FenceBuilder extends AdapterBase implements FenceBuilder { Map fenceParams; private static final Logger LOGGER = Logger.getLogger(Ovm3FenceBuilder.class); diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java index 3711bbf65f1..5f21c7de034 100755 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java @@ -17,7 +17,6 @@ package com.cloud.hypervisor.ovm3.resources; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; @@ -43,7 +42,6 @@ import com.cloud.storage.dao.GuestOSDao; import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachineProfile; -@Local(value = HypervisorGuru.class) public class Ovm3HypervisorGuru extends HypervisorGuruBase implements HypervisorGuru { private final Logger LOGGER = Logger.getLogger(Ovm3HypervisorGuru.class); @Inject diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java index 0eeef82c055..9211214ccdc 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java @@ -28,7 +28,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.regex.PatternSyntaxException; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -72,7 +71,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @Component -@Local(value = {MockAgentManager.class}) public class MockAgentManagerImpl extends ManagerBase implements MockAgentManager { private static final Logger s_logger = Logger.getLogger(MockAgentManagerImpl.class); @Inject diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java index a4fc2f9c10b..dba9059c213 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -102,7 +101,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.DiskProfile; @Component -@Local(value = {MockStorageManager.class}) public class MockStorageManagerImpl extends ManagerBase implements MockStorageManager { private static final Logger s_logger = Logger.getLogger(MockStorageManagerImpl.class); @Inject diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java index d58029564bb..6602e1f1ad0 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -92,7 +91,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine.PowerState; @Component -@Local(value = {MockVmManager.class}) public class MockVmManagerImpl extends ManagerBase implements MockVmManager { private static final Logger s_logger = Logger.getLogger(MockVmManagerImpl.class); diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java index a5dc9ebd476..03593392ba7 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -132,7 +131,6 @@ import com.google.gson.Gson; import com.google.gson.stream.JsonReader; @Component -@Local(value = {SimulatorManager.class}) public class SimulatorManagerImpl extends ManagerBase implements SimulatorManager, PluggableService { private static final Logger s_logger = Logger.getLogger(SimulatorManagerImpl.class); private static final Gson s_gson = GsonHelper.getGson(); diff --git a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorFencer.java b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorFencer.java index aa7c3d49cb4..86c28715e0b 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorFencer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorFencer.java @@ -19,7 +19,6 @@ package com.cloud.ha; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -39,7 +38,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value=FenceBuilder.class) public class SimulatorFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(SimulatorFencer.class); diff --git a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java index bc55ba32497..aa40f1bb28d 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java +++ b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java @@ -18,7 +18,6 @@ package com.cloud.ha; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -41,7 +40,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.PowerState; -@Local(value=Investigator.class) public class SimulatorInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(SimulatorInvestigator.class); @Inject diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java index 7c31a9af754..76eb1c08a7e 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorDiscoverer.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -53,7 +52,6 @@ import com.cloud.storage.VMTemplateZoneVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateZoneDao; -@Local(value = Discoverer.class) public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(SimulatorDiscoverer.class); diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java index 11bf3466105..6e75244c323 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -45,7 +44,6 @@ import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.storage.dao.SnapshotDao; -@Local(value = Discoverer.class) public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer implements ResourceStateAdapter, Listener { private static final Logger s_logger = Logger.getLogger(SimulatorSecondaryDiscoverer.class); @Inject diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java index 378134a9856..4516c7c2fb8 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java @@ -18,7 +18,6 @@ package com.cloud.simulator; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.api.to.VirtualMachineTO; @@ -29,7 +28,6 @@ import com.cloud.storage.GuestOSVO; import com.cloud.storage.dao.GuestOSDao; import com.cloud.vm.VirtualMachineProfile; -@Local(value = HypervisorGuru.class) public class SimulatorGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java index 1196260a9ae..e3c50fddcd7 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockConfigurationDaoImpl.java @@ -20,7 +20,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Formatter; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {MockConfigurationDao.class}) public class MockConfigurationDaoImpl extends GenericDaoBase implements MockConfigurationDao { final static Logger s_logger = Logger.getLogger(MockConfigurationDaoImpl.class); private final SearchBuilder _searchByDcIdName; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDaoImpl.java index efd101bdc46..195958ae4a8 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockHostDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.simulator.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {MockHostDao.class}) public class MockHostDaoImpl extends GenericDaoBase implements MockHostDao { protected final SearchBuilder GuidSearch; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java index 4837900170d..ac18e53dbca 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecStorageDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.simulator.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {MockSecStorageDao.class}) public class MockSecStorageDaoImpl extends GenericDaoBase implements MockSecStorageDao { protected final SearchBuilder urlSearch; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java index 2fa6cefbc62..4b570255d75 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockSecurityRulesDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.simulator.dao; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {MockSecurityRulesDao.class}) public class MockSecurityRulesDaoImpl extends GenericDaoBase implements MockSecurityRulesDao { protected SearchBuilder vmIdSearch; protected SearchBuilder hostSearch; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java index 67d5e4bc9cb..ea9bcc4063c 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockStoragePoolDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.simulator.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {MockStoragePoolDao.class}) public class MockStoragePoolDaoImpl extends GenericDaoBase implements MockStoragePoolDao { protected final SearchBuilder uuidSearch; protected final SearchBuilder hostguidSearch; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java index 4bf2f8ef591..c0073588913 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVMDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -35,7 +34,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.VirtualMachine; @Component -@Local(value = {MockVMDao.class}) public class MockVMDaoImpl extends GenericDaoBase implements MockVMDao { protected SearchBuilder GuidSearch; protected SearchBuilder vmNameSearch; diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java index bc106962d98..5ebccb8161e 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/dao/MockVolumeDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.simulator.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; @Component -@Local(value = {MockVolumeDao.class}) public class MockVolumeDaoImpl extends GenericDaoBase implements MockVolumeDao { protected final SearchBuilder idTypeSearch; protected final SearchBuilder pathTypeSearch; diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java index 4e80f6df460..b3aea1eafb4 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java @@ -17,12 +17,10 @@ // package com.cloud.ucs.database; -import javax.ejb.Local; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -@Local(value = {UcsBladeDao.class}) @DB() public class UcsBladeDaoImpl extends GenericDaoBase implements UcsBladeDao { diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java index 222965f0d0e..16f093acea0 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java @@ -17,12 +17,10 @@ // package com.cloud.ucs.database; -import javax.ejb.Local; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -@Local(value = {UcsManagerDao.class}) @DB() public class UcsManagerDaoImpl extends GenericDaoBase implements UcsManagerDao { } diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java index e6316062bf3..5f8dc15f050 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java @@ -16,13 +16,11 @@ // under the License. package com.cloud.ha; -import javax.ejb.Local; import com.cloud.host.Host; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value = FenceBuilder.class) public class VmwareFencer extends AdapterBase implements FenceBuilder { @Override diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java index 3f7a05c4f23..5bfc1896843 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java +++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.ha; -import javax.ejb.Local; import com.cloud.host.Host; import com.cloud.host.Status; @@ -24,7 +23,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@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 62d82c24b2e..cc3880b2c0e 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; @@ -105,7 +104,6 @@ import com.cloud.vm.VmDetailConstants; import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = HypervisorGuru.class) public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Configurable { 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 20eb6595f83..35063b05859 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -80,7 +79,6 @@ import com.cloud.user.Account; import com.cloud.utils.Pair; import com.cloud.utils.UriUtils; -@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/dao/LegacyZoneDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java index 46e8105f0a9..28c98fd7831 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.hypervisor.vmware.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = LegacyZoneDao.class) @DB public class LegacyZoneDaoImpl extends GenericDaoBase implements LegacyZoneDao { protected static final Logger s_logger = Logger.getLogger(LegacyZoneDaoImpl.class); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java index bd12f92833a..e44087e6ada 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.hypervisor.vmware.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = VmwareDatacenterDao.class) @DB public class VmwareDatacenterDaoImpl extends GenericDaoBase implements VmwareDatacenterDao { protected static final Logger s_logger = Logger.getLogger(VmwareDatacenterDaoImpl.class); diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java index 294267164d4..b44bfc70454 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java @@ -17,7 +17,6 @@ package com.cloud.hypervisor.vmware.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = VmwareDatacenterZoneMapDao.class) public class VmwareDatacenterZoneMapDaoImpl extends GenericDaoBase implements VmwareDatacenterZoneMapDao { protected final SearchBuilder zoneSearch; 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 eb0ec55505c..b65916b63eb 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -32,7 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -123,7 +122,6 @@ import com.cloud.utils.script.Script; import com.cloud.utils.ssh.SshHelper; import com.cloud.vm.DomainRouterVO; -@Local(value = {VmwareManager.class, VmwareDatacenterService.class}) public class VmwareManagerImpl extends ManagerBase implements VmwareManager, VmwareStorageMount, Listener, VmwareDatacenterService { 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 69517793dff..4fff0224783 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = CiscoNexusVSMDeviceDao.class) @DB 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 81e4f8637ed..f67b2e73bd1 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -68,7 +67,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkElement.class) public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl implements CiscoNexusVSMElementService, NetworkElement, Manager { private static final Logger s_logger = Logger.getLogger(CiscoNexusVSMElement.class); diff --git a/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java index 28cba2b98c4..af89a0ada66 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java @@ -19,7 +19,6 @@ package com.cloud.ha; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -40,7 +39,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value = FenceBuilder.class) public class XenServerFencer extends AdapterBase implements FenceBuilder { private static final Logger s_logger = Logger.getLogger(XenServerFencer.class); diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java index 9567f313492..7153c5749fd 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; @@ -60,7 +59,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import org.apache.log4j.Logger; -@Local(value = HypervisorGuru.class) public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru, Configurable { private final Logger LOGGER = Logger.getLogger(XenServerGuru.class); @Inject diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java index 3f1e52e6ddd..63c44853d1a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java @@ -86,7 +86,6 @@ import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.EntityExistsException; @@ -102,7 +101,6 @@ import java.util.Queue; import java.util.Set; -@Local(value = Discoverer.class) public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(XcpServerDiscoverer.class); protected String _publicNic; diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java b/plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java index f0b4a06b987..67a83e129dd 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java @@ -21,7 +21,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = BigSwitchBcfDao.class) public class BigSwitchBcfDaoImpl extends GenericDaoBase implements BigSwitchBcfDao { protected final SearchBuilder physicalNetworkIdSearch; diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java b/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java index dba9de2be8c..776f76fabca 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/element/BigSwitchBcfElement.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -126,9 +125,6 @@ import com.cloud.vm.dao.VMInstanceDao; * removes them when the VM is destroyed. */ @Component -@Local(value = {NetworkElement.class, ConnectivityProvider.class, IpDeployer.class, - SourceNatServiceProvider.class, StaticNatServiceProvider.class, - NetworkACLServiceProvider.class, FirewallServiceProvider.class}) public class BigSwitchBcfElement extends AdapterBase implements BigSwitchBcfElementService, ConnectivityProvider, IpDeployer, SourceNatServiceProvider, StaticNatServiceProvider, NetworkACLServiceProvider, FirewallServiceProvider, ResourceStateAdapter { diff --git a/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java b/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java index e205f47ef15..f27a4295590 100644 --- a/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java +++ b/plugins/network-elements/bigswitch/src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java @@ -21,7 +21,6 @@ package com.cloud.network.guru; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.context.CallContext; @@ -90,7 +89,6 @@ import com.cloud.vm.dao.VMInstanceDao; * register them with the controller to be plugged into the corresponding network. It also * removes them when the VM is destroyed. */ -@Local(value = NetworkGuru.class) public class BigSwitchBcfGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigrationResponder { private static final Logger s_logger = Logger.getLogger(BigSwitchBcfGuestNetworkGuru.class); diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java index ec5691adf50..80bc7dac224 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java @@ -21,7 +21,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = BrocadeVcsDao.class) public class BrocadeVcsDaoImpl extends GenericDaoBase implements BrocadeVcsDao { protected final SearchBuilder physicalNetworkIdSearch; diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java index 88c52a6bb24..753fd278b29 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = BrocadeVcsNetworkVlanMappingDao.class) public class BrocadeVcsNetworkVlanMappingDaoImpl extends GenericDaoBase implements BrocadeVcsNetworkVlanMappingDao { protected final SearchBuilder networkSearch; diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java index b551092300e..f075b3202e6 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/element/BrocadeVcsElement.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -92,7 +91,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; @Component -@Local(value = {NetworkElement.class}) public class BrocadeVcsElement extends AdapterBase implements NetworkElement, ResourceStateAdapter, BrocadeVcsElementService { private static final Logger s_logger = Logger.getLogger(BrocadeVcsElement.class); diff --git a/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java b/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java index 92bf113f9a3..ba06d14a4c0 100644 --- a/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java +++ b/plugins/network-elements/brocade-vcs/src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java @@ -18,7 +18,6 @@ package com.cloud.network.guru; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -63,7 +62,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkGuru.class) public class BrocadeVcsGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(BrocadeVcsGuestNetworkGuru.class); diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java index ee34c810782..f10b11251a8 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = CiscoAsa1000vDao.class) public class CiscoAsa1000vDaoImpl extends GenericDaoBase implements CiscoAsa1000vDao { protected final SearchBuilder physicalNetworkIdSearch; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java index ccf332268aa..c0f83582efd 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = CiscoVnmcDao.class) public class CiscoVnmcDaoImpl extends GenericDaoBase implements CiscoVnmcDao { protected final SearchBuilder physicalNetworkIdSearch; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java index 13723ab5be8..a3627f101c8 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -27,7 +26,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NetworkAsa1000vMapDao.class) public class NetworkAsa1000vMapDaoImpl extends GenericDaoBase implements NetworkAsa1000vMapDao { protected final SearchBuilder networkSearch; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java index d4d3c8dd0a6..23c9c29b4b3 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.EntityExistsException; @@ -134,7 +133,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkElement.class) public class CiscoVnmcElement extends AdapterBase implements SourceNatServiceProvider, FirewallServiceProvider, PortForwardingServiceProvider, IpDeployer, StaticNatServiceProvider, ResourceStateAdapter, NetworkElement, CiscoVnmcElementService, CiscoAsa1000vService { private static final Logger s_logger = Logger.getLogger(CiscoVnmcElement.class); diff --git a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java index 4e0a3196dfb..0b96aa35150 100644 --- a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java +++ b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; @@ -43,7 +42,6 @@ import com.cloud.vm.VirtualMachineProfile; * @author ahuang * */ -@Local(NetworkElement.class) public class DnsNotifier extends AdapterBase implements NetworkElement { public DnsNotifier() { 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 1d92d07133f..d640b62f1ee 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 @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -56,7 +55,6 @@ import com.cloud.vm.ReservationContext; 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); private static final Map> capabilities = setCapabilities(); 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 b2d651c4f70..d9175548649 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 @@ -27,7 +27,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -103,7 +102,6 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; @Component -@Local(value = {ElasticLoadBalancerManager.class}) public class ElasticLoadBalancerManagerImpl extends ManagerBase implements ElasticLoadBalancerManager, VirtualMachineGuru { private static final Logger s_logger = Logger.getLogger(ElasticLoadBalancerManagerImpl.class); 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 5b2b63aeb6c..bbe79ef3103 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 @@ -19,7 +19,6 @@ package com.cloud.network.lb.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.vm.DomainRouterVO; import com.cloud.vm.dao.DomainRouterDao; @Component -@Local(value = {ElasticLbVmMapDao.class}) public class ElasticLbVmMapDaoImpl extends GenericDaoBase implements ElasticLbVmMapDao { @Inject protected DomainRouterDao _routerDao; 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 1cd6851b582..2527e0d9417 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 @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -93,7 +92,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkElement.class, LoadBalancingServiceProvider.class, IpDeployer.class}) public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, IpDeployer, F5ExternalLoadBalancerElementService, ExternalLoadBalancerDeviceManager { diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElement.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElement.java index 042145bf926..28b2988cf6a 100644 --- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElement.java +++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/element/GloboDnsElement.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -79,7 +78,6 @@ import com.globo.globodns.cloudstack.commands.SignInCommand; import com.globo.globodns.cloudstack.resource.GloboDnsResource; @Component -@Local(NetworkElement.class) public class GloboDnsElement extends AdapterBase implements ResourceStateAdapter, NetworkElement, GloboDnsElementService, Configurable { private static final Logger s_logger = Logger.getLogger(GloboDnsElement.class); diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java index fcdbfb75cee..1e0b2945f14 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -59,7 +58,6 @@ import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.VirtualRouterProviderDao; import com.cloud.network.element.IpDeployer; import com.cloud.network.element.LoadBalancingServiceProvider; -import com.cloud.network.element.NetworkElement; import com.cloud.network.element.VirtualRouterElement; import com.cloud.network.element.VirtualRouterProviderVO; import com.cloud.network.lb.LoadBalancingRule; @@ -84,7 +82,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.DomainRouterDao; -@Local(value = {NetworkElement.class}) public class InternalLoadBalancerElement extends AdapterBase implements LoadBalancingServiceProvider, InternalLoadBalancerElementService, IpDeployer { private static final Logger s_logger = Logger.getLogger(InternalLoadBalancerElement.class); protected static final Map> capabilities = setCapabilities(); diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java index bb153ff2ed9..52ecebc08bc 100644 --- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java +++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java @@ -23,7 +23,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -120,7 +119,6 @@ import com.cloud.vm.VirtualMachineProfile.Param; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; -@Local(value = {InternalLoadBalancerVMManager.class, InternalLoadBalancerVMService.class}) public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements InternalLoadBalancerVMManager, InternalLoadBalancerVMService, VirtualMachineGuru { private static final Logger s_logger = Logger.getLogger(InternalLoadBalancerVMManagerImpl.class); static final private String InternalLbVmNamePrefix = "b"; diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java index 7f564098755..4440b2e2009 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.network.contrail.api.command.CreateServiceInstanceCmd; @@ -67,7 +66,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; @Component -@Local(value = {ContrailElement.class, StaticNatServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class}) public class ContrailElementImpl extends AdapterBase implements ContrailElement, StaticNatServiceProvider, IpDeployer, SourceNatServiceProvider, DhcpServiceProvider { diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java index 8a86bc85363..364118f84e4 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.net.URI; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.network.contrail.model.InstanceIpModel; @@ -72,7 +71,6 @@ import com.cloud.vm.dao.NicDao; import net.juniper.contrail.api.types.MacAddressesType; import net.juniper.contrail.api.types.VirtualMachineInterface; -@Local(value = {NetworkGuru.class}) public class ContrailGuru extends AdapterBase implements NetworkGuru { @Inject NetworkDao _networkDao; diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java index cc87aa5cee1..4ad7a5ff551 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManagerImpl.java @@ -31,7 +31,6 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -100,7 +99,6 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; import com.google.common.collect.ImmutableList; -@Local(value = { ContrailManager.class}) public class ContrailManagerImpl extends ManagerBase implements ContrailManager { @Inject public ConfigurationService _configService; diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java index 4a72fcb6697..689b252b2a7 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java @@ -20,7 +20,6 @@ package org.apache.cloudstack.network.contrail.management; import java.io.IOException; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.network.contrail.model.VirtualNetworkModel; @@ -46,7 +45,6 @@ import com.cloud.network.vpc.dao.NetworkACLDao; import com.cloud.vm.ReservationContext; @Component -@Local(value = {NetworkACLServiceProvider.class, VpcProvider.class, ContrailElementImpl.class}) public class ContrailVpcElementImpl extends ContrailElementImpl implements NetworkACLServiceProvider, VpcProvider { private static final Logger s_logger = Logger.getLogger(ContrailElement.class); 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 cb31ea440a1..52ca472ea52 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 @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -89,7 +88,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkElement.class, FirewallServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class, RemoteAccessVPNServiceProvider.class}) public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider, PortForwardingServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider { diff --git a/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java b/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java index e1d93303248..c85cb38b97e 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.ws.rs.core.MultivaluedMap; @@ -87,8 +86,6 @@ import com.cloud.vm.dao.NicDao; import com.sun.jersey.core.util.MultivaluedMapImpl; @Component -@Local(value = {NetworkElement.class, ConnectivityProvider.class, FirewallServiceProvider.class, SourceNatServiceProvider.class, DhcpServiceProvider.class, - StaticNatServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class}) public class MidoNetElement extends AdapterBase implements ConnectivityProvider, DhcpServiceProvider, SourceNatServiceProvider, StaticNatServiceProvider, IpDeployer, PortForwardingServiceProvider, FirewallServiceProvider, PluggableService { diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java index aaf2fca51ba..54480e9ddb2 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java @@ -19,7 +19,6 @@ package com.cloud.network.guru; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -45,7 +44,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = NetworkGuru.class) public class MidoNetGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(MidoNetGuestNetworkGuru.class); diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java index bb1b6f9b3de..43093a4fd3f 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java @@ -20,7 +20,6 @@ package com.cloud.network.guru; import java.net.URI; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -55,7 +54,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkGuru.class) public class MidoNetPublicNetworkGuru extends PublicNetworkGuru { private static final Logger s_logger = Logger.getLogger(MidoNetPublicNetworkGuru.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 155db7b4a8a..e56a40ef9ce 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 @@ -18,7 +18,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NetScalerPodDao.class) @DB 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 9e679f61356..99db9ee8158 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 @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -117,7 +116,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkElement.class, StaticNatServiceProvider.class, LoadBalancingServiceProvider.class, GslbServiceProvider.class}) public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, IpDeployer, StaticNatServiceProvider, GslbServiceProvider { diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpDaoImpl.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpDaoImpl.java index 3144c811aeb..34df10e2cf4 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpDaoImpl.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpDaoImpl.java @@ -21,7 +21,6 @@ package com.cloud.network.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ 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 { protected final SearchBuilder physicalNetworkIdSearch; diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java index 603855cc0f3..0d256b0d51d 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ 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 { protected final SearchBuilder nicSearch; diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java index 67d36582f6c..239072f885f 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.dao; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = NiciraNvpRouterMappingDao.class) public class NiciraNvpRouterMappingDaoImpl extends GenericDaoBase implements NiciraNvpRouterMappingDao { protected final SearchBuilder networkSearch; diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java index 0243e2d4052..909134dbb64 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/element/NiciraNvpElement.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -129,8 +128,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; @Component -@Local(value = {NetworkElement.class, ConnectivityProvider.class, SourceNatServiceProvider.class, StaticNatServiceProvider.class, PortForwardingServiceProvider.class, - IpDeployer.class}) public class NiciraNvpElement extends AdapterBase implements ConnectivityProvider, SourceNatServiceProvider, PortForwardingServiceProvider, StaticNatServiceProvider, NiciraNvpElementService, ResourceStateAdapter, IpDeployer { diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java index 975ebd19aa0..fc41286f0c8 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java @@ -23,7 +23,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -67,7 +66,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkGuru.class) public class NiciraNvpGuestNetworkGuru extends GuestNetworkGuru { private static final int MAX_NAME_LENGTH = 40; diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java index ec60c49aee0..d308fe18a4b 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java @@ -25,11 +25,9 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import org.springframework.stereotype.Component; -import javax.ejb.Local; import java.util.List; @Component -@Local(value = NuageVspDao.class) public class NuageVspDaoImpl extends GenericDaoBase implements NuageVspDao { diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java index d9243d4d7b8..66fbaffbbba 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java @@ -93,7 +93,6 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import java.util.ArrayList; @@ -102,7 +101,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -@Local(value = {NetworkElement.class, ConnectivityProvider.class, IpDeployer.class, SourceNatServiceProvider.class, StaticNatServiceProvider.class, FirewallServiceProvider.class, DhcpServiceProvider.class, VpcProvider.class, NetworkACLServiceProvider.class}) public class NuageVspElement extends AdapterBase implements ConnectivityProvider, IpDeployer, SourceNatServiceProvider, StaticNatServiceProvider, FirewallServiceProvider, DhcpServiceProvider, ResourceStateAdapter, VpcProvider, NetworkACLServiceProvider { diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java index e6251219457..5f69a2139ac 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java @@ -74,7 +74,6 @@ import com.google.common.base.Strings; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.net.URI; import java.util.ArrayList; @@ -85,7 +84,6 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -@Local(value = NetworkGuru.class) public class NuageVspGuestNetworkGuru extends GuestNetworkGuru { public static final Logger s_logger = Logger.getLogger(NuageVspGuestNetworkGuru.class); diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java index dc53310dc20..4c0b0f7788c 100644 --- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java +++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/manager/NuageVspManagerImpl.java @@ -116,7 +116,6 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import java.util.ArrayList; @@ -132,7 +131,6 @@ import java.util.concurrent.ScheduledExecutorService; import static com.cloud.agent.api.sync.SyncNuageVspCmsIdCommand.SyncType; -@Local(value = {NuageVspManager.class}) public class NuageVspManagerImpl extends ManagerBase implements NuageVspManager, Configurable, StateListener { private static final Logger s_logger = Logger.getLogger(NuageVspManagerImpl.class); diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java index 05bc8317090..9bae4bd19e6 100644 --- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java +++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/OpendaylightElement.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -46,7 +45,6 @@ import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.network.element.ConnectivityProvider; -import com.cloud.network.element.NetworkElement; import com.cloud.offering.NetworkOffering; import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; @@ -59,7 +57,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = {NetworkElement.class, ConnectivityProvider.class}) public class OpendaylightElement extends AdapterBase implements ConnectivityProvider, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(OpendaylightElement.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 5ce4d935389..5ebf62b2c5e 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,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -80,9 +79,6 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; import com.google.gson.Gson; -@Local(value = {NetworkElement.class, ConnectivityProvider.class, - SourceNatServiceProvider.class, StaticNatServiceProvider.class, - PortForwardingServiceProvider.class, IpDeployer.class, NetworkMigrationResponder.class}) public class OvsElement extends AdapterBase implements NetworkElement, OvsElementService, ConnectivityProvider, ResourceStateAdapter, PortForwardingServiceProvider, LoadBalancingServiceProvider, NetworkMigrationResponder, 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 be49757fc5f..f3f8ea052bd 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 @@ -18,7 +18,6 @@ package com.cloud.network.guru; import com.cloud.network.vpc.VpcVO; import com.cloud.network.vpc.dao.VpcDao; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -54,7 +53,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; @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/OvsNetworkTopologyGuruImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java index 7f86f3af48c..c8500665a7c 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsNetworkTopologyGuruImpl.java @@ -36,12 +36,10 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @Component -@Local(value = {OvsNetworkTopologyGuru.class}) public class OvsNetworkTopologyGuruImpl extends ManagerBase implements OvsNetworkTopologyGuru { @Inject 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 9024abb1ad8..cde4ee8a797 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 @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.persistence.EntityExistsException; @@ -92,7 +91,6 @@ import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.VMInstanceDao; @Component -@Local(value = {OvsTunnelManager.class}) public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager, StateListener { public static final Logger s_logger = Logger.getLogger(OvsTunnelManagerImpl.class.getName()); 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 d50737a4d5f..5235bae5c89 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 @@ -19,7 +19,6 @@ package com.cloud.network.ovs.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ 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 { protected final SearchBuilder hostAndLabelSearch; 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 3fdf3816e48..5e314f0fd69 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 @@ -19,7 +19,6 @@ package com.cloud.network.ovs.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -29,7 +28,6 @@ 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 { protected final SearchBuilder fromToNetworkSearch; diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java index 88fa9c1da4e..92d1e971745 100644 --- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java +++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.ovs.dao; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -26,7 +25,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {VpcDistributedRouterSeqNoDao.class}) public class VpcDistributedRouterSeqNoDaoImpl extends GenericDaoBase implements VpcDistributedRouterSeqNoDao { protected static final Logger s_logger = Logger.getLogger(VpcDistributedRouterSeqNoDaoImpl.class); private SearchBuilder VpcIdSearch; diff --git a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java index cfb64b8bde4..d631d992101 100644 --- a/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java +++ b/plugins/network-elements/palo-alto/src/com/cloud/network/element/PaloAltoExternalFirewallElement.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -83,7 +82,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkElement.class, FirewallServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class}) public class PaloAltoExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider, PortForwardingServiceProvider, IpDeployer, PaloAltoFirewallElementService, StaticNatServiceProvider { diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java index 035fd56e4a5..aea77166f92 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.network.dao; -import javax.ejb.Local; 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; -@Local(SspCredentialDao.class) public class SspCredentialDaoImpl extends GenericDaoBase implements SspCredentialDao { private final SearchBuilder PnetSearch; diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java index 9794a526667..b90cf13485d 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package org.apache.cloudstack.network.dao; -import javax.ejb.Local; 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; -@Local(SspTenantDao.class) public class SspTenantDaoImpl extends GenericDaoBase implements SspTenantDao { private final SearchBuilder zoneSearch; diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java index d088e7fad0a..91d60913103 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.network.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -29,7 +28,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.vm.NicProfile; -@Local(SspUuidDao.class) public class SspUuidDaoImpl extends GenericDaoBase implements SspUuidDao { private static final Logger s_logger = Logger.getLogger(SspUuidDaoImpl.class); diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java index b41be40b4e9..475c0d4e061 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -67,7 +66,6 @@ import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.element.ConnectivityProvider; -import com.cloud.network.element.NetworkElement; import com.cloud.offering.NetworkOffering; import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; @@ -88,7 +86,6 @@ import com.cloud.vm.dao.NicDao; * but note this is not necessary. The other way is create our own database * table for that information. */ -@Local(value = {NetworkElement.class, SspManager.class}) public class SspElement extends AdapterBase implements ConnectivityProvider, SspManager, SspService, NetworkMigrationResponder { private static final Logger s_logger = Logger.getLogger(SspElement.class); public static final String s_SSP_NAME = "StratosphereSsp"; diff --git a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java index 7226873238b..be73e14060f 100644 --- a/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java @@ -16,7 +16,6 @@ // under the License. package org.apache.cloudstack.network.guru; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -35,7 +34,6 @@ import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; import com.cloud.network.dao.NetworkDao; import com.cloud.network.guru.GuestNetworkGuru; -import com.cloud.network.guru.NetworkGuru; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.vm.NicProfile; @@ -46,7 +44,6 @@ import com.cloud.vm.VirtualMachineProfile; /** * Stratosphere SDN Platform NetworkGuru */ -@Local(value = NetworkGuru.class) public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigrationResponder { private static final Logger s_logger = Logger.getLogger(SspGuestNetworkGuru.class); diff --git a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java b/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java index 4138b228e10..8d2015584da 100644 --- a/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java +++ b/plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.guru; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -47,7 +46,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = NetworkGuru.class) public class VxlanGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(VxlanGuestNetworkGuru.class); diff --git a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java index 83c23c2a536..441749091ad 100644 --- a/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java +++ b/plugins/storage-allocators/random/src/org/apache/cloudstack/storage/allocator/RandomStoragePoolAllocator.java @@ -19,11 +19,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; -import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import com.cloud.deploy.DeploymentPlan; @@ -33,7 +31,6 @@ import com.cloud.storage.StoragePool; import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; -@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/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java index 0f2a0150eba..8125f8cd2de 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java @@ -18,7 +18,6 @@ package org.apache.cloudstack.ldap.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -31,7 +30,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {LdapConfigurationDao.class}) public class LdapConfigurationDaoImpl extends GenericDaoBase implements LdapConfigurationDao { private final SearchBuilder hostnameSearch; private final SearchBuilder listAllConfigurationsSearch; diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java index fb0d74d122d..57830982e70 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java @@ -18,7 +18,6 @@ */ package org.apache.cloudstack.ldap.dao; -import javax.ejb.Local; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -28,7 +27,6 @@ import org.springframework.stereotype.Component; import com.cloud.utils.db.GenericDaoBase; @Component -@Local(value = {LdapTrustMapDao.class}) public class LdapTrustMapDaoImpl extends GenericDaoBase implements LdapTrustMapDao { private final SearchBuilder domainIdSearch; 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 f08ec378b4e..5a06c6856f3 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 @@ -22,7 +22,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.math.BigInteger; import java.security.MessageDigest; @@ -34,7 +33,6 @@ import java.util.Map; * comparing it against the local database. * */ -@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/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java b/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java index 130950d5186..b8c274da62f 100644 --- a/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java +++ b/plugins/user-authenticators/pbkdf2/src/org/apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java @@ -29,7 +29,6 @@ import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator; import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.util.encoders.Base64; -import javax.ejb.Local; import javax.inject.Inject; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; @@ -39,7 +38,6 @@ import java.util.Map; import static java.lang.String.format; -@Local({UserAuthenticator.class}) public class PBKDF2UserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(PBKDF2UserAuthenticator.class); private static final int s_saltlen = 64; 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 aaff27e58f3..7907fbdf65f 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 @@ -21,11 +21,9 @@ import com.cloud.utils.Pair; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.util.Map; -@Local(value = {UserAuthenticator.class}) public class PlainTextUserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(PlainTextUserAuthenticator.class); diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java index a8740ac2709..e2d1b888460 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java @@ -23,7 +23,6 @@ import com.cloud.user.UserVO; import com.cloud.user.dao.UserDao; import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.AdapterBase; -import org.apache.cloudstack.api.auth.PluggableAPIAuthenticator; import org.apache.cloudstack.api.command.AuthorizeSAMLSSOCmd; import org.apache.cloudstack.api.command.GetServiceProviderMetaDataCmd; import org.apache.cloudstack.api.command.ListAndSwitchSAMLAccountCmd; @@ -62,7 +61,6 @@ import org.opensaml.xml.security.credential.UsageType; import org.opensaml.xml.security.keyinfo.KeyInfoHelper; import org.springframework.stereotype.Component; -import javax.ejb.Local; import javax.inject.Inject; import javax.xml.stream.FactoryConfigurationError; import java.io.ByteArrayInputStream; @@ -91,7 +89,6 @@ import java.util.Timer; import java.util.TimerTask; @Component -@Local(value = {SAML2AuthManager.class, PluggableAPIAuthenticator.class}) public class SAML2AuthManagerImpl extends AdapterBase implements SAML2AuthManager, Configurable { private static final Logger s_logger = Logger.getLogger(SAML2AuthManagerImpl.class); diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java index 65a7959d997..4b891cef5f4 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java @@ -15,7 +15,6 @@ package org.apache.cloudstack.saml; import com.cloud.server.auth.DefaultUserAuthenticator; -import com.cloud.server.auth.UserAuthenticator; import com.cloud.user.User; import com.cloud.user.UserAccount; import com.cloud.user.dao.UserAccountDao; @@ -24,11 +23,9 @@ import com.cloud.utils.Pair; import org.apache.cxf.common.util.StringUtils; import org.apache.log4j.Logger; -import javax.ejb.Local; import javax.inject.Inject; import java.util.Map; -@Local(value = {UserAuthenticator.class}) public class SAML2UserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(SAML2UserAuthenticator.class); diff --git a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java index eb106d97ad0..20094c72e5a 100644 --- a/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java +++ b/plugins/user-authenticators/saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java @@ -22,12 +22,10 @@ import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import org.springframework.stereotype.Component; -import javax.ejb.Local; import java.sql.PreparedStatement; @DB @Component -@Local(value = {SAMLTokenDao.class}) public class SAMLTokenDaoImpl extends GenericDaoBase implements SAMLTokenDao { public SAMLTokenDaoImpl() { diff --git a/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java b/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java index e35c29d3e25..2014762cf89 100644 --- a/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java +++ b/plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java @@ -24,7 +24,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.bouncycastle.util.encoders.Base64; -import javax.ejb.Local; import javax.inject.Inject; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; @@ -32,7 +31,6 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Map; -@Local(value = {UserAuthenticator.class}) public class SHA256SaltedUserAuthenticator extends DefaultUserAuthenticator { public static final Logger s_logger = Logger.getLogger(SHA256SaltedUserAuthenticator.class); private static final String s_defaultPassword = "000000000000000000000000000="; diff --git a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java index 57f7b37cc08..6e5e55b85ec 100644 --- a/server/src/com/cloud/acl/AffinityGroupAccessChecker.java +++ b/server/src/com/cloud/acl/AffinityGroupAccessChecker.java @@ -16,14 +16,12 @@ // under the License. package com.cloud.acl; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao; @@ -35,7 +33,6 @@ import com.cloud.user.AccountManager; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = SecurityChecker.class) public class AffinityGroupAccessChecker extends DomainChecker { @Inject diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java index 60389ab3b75..c9e4087f6ba 100644 --- a/server/src/com/cloud/acl/DomainChecker.java +++ b/server/src/com/cloud/acl/DomainChecker.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.acl; -import javax.ejb.Local; import javax.inject.Inject; import org.springframework.stereotype.Component; @@ -47,7 +46,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.utils.component.AdapterBase; @Component -@Local(value = SecurityChecker.class) public class DomainChecker extends AdapterBase implements SecurityChecker { @Inject 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 a6736d64137..33cee36e192 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -67,7 +66,6 @@ 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 extends AdapterBase implements HostAllocator { private static final Logger s_logger = Logger.getLogger(FirstFitAllocator.class); @Inject 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 78a9149afce..4f2f391494d 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitRoutingAllocator.java @@ -19,18 +19,15 @@ package com.cloud.agent.manager.allocator.impl; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.NDC; -import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.host.Host; import com.cloud.host.Host.Type; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {HostAllocator.class}) public class FirstFitRoutingAllocator extends FirstFitAllocator { @Override public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, int returnUpTo) { 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 161c9658be0..a4797c11d6e 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -32,7 +31,6 @@ import org.springframework.stereotype.Component; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; @@ -56,7 +54,6 @@ 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 00fa58be425..fd8e65e2476 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.manager.allocator.HostAllocator; @@ -34,7 +33,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {HostAllocator.class}) public class TestingAllocator extends AdapterBase implements HostAllocator { @Inject 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 885032e1761..ebef518bb0d 100644 --- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -58,7 +57,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = PodAllocator.class) public class UserConcentratedAllocator extends AdapterBase 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 1aa8f9168f0..56bff0df6f9 100644 --- a/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java +++ b/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java @@ -18,7 +18,6 @@ package com.cloud.agent.manager.authn.impl; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -37,7 +36,6 @@ import com.cloud.host.dao.HostDao; import com.cloud.utils.component.AdapterBase; @Component -@Local(value = {AgentAuthorizer.class, StartupCommandProcessor.class}) public class BasicAgentAuthManager extends AdapterBase implements AgentAuthorizer, StartupCommandProcessor { private static final Logger s_logger = Logger.getLogger(BasicAgentAuthManager.class); @Inject diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index 189e473b6f6..9b9802a095b 100644 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -28,7 +28,6 @@ import java.util.Timer; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ejb.Local; import javax.inject.Inject; import javax.mail.Authenticator; import javax.mail.Message.RecipientType; @@ -87,7 +86,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.SearchCriteria; -@Local(value = {AlertManager.class}) public class AlertManagerImpl extends ManagerBase implements AlertManager, Configurable { private static final Logger s_logger = Logger.getLogger(AlertManagerImpl.class.getName()); private static final Logger s_alertsLogger = Logger.getLogger("org.apache.cloudstack.alerts"); diff --git a/server/src/com/cloud/alert/ClusterAlertAdapter.java b/server/src/com/cloud/alert/ClusterAlertAdapter.java index ccb10746c86..2b7b392c0bd 100644 --- a/server/src/com/cloud/alert/ClusterAlertAdapter.java +++ b/server/src/com/cloud/alert/ClusterAlertAdapter.java @@ -18,7 +18,6 @@ package com.cloud.alert; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -35,7 +34,6 @@ import com.cloud.utils.events.EventArgs; import com.cloud.utils.events.SubscriptionMgr; @Component -@Local(value = AlertAdapter.class) public class ClusterAlertAdapter extends AdapterBase implements AlertAdapter { private static final Logger s_logger = Logger.getLogger(ClusterAlertAdapter.class); diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java index ba1dca4a855..72dd0d7fb0b 100644 --- a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java +++ b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java @@ -18,7 +18,6 @@ package com.cloud.alert; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -36,7 +35,6 @@ import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.dao.ConsoleProxyDao; @Component -@Local(value = AlertAdapter.class) public class ConsoleProxyAlertAdapter extends AdapterBase implements AlertAdapter { private static final Logger s_logger = Logger.getLogger(ConsoleProxyAlertAdapter.class); diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java index 392015b8f0e..c29b982a5c4 100644 --- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java +++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java @@ -18,7 +18,6 @@ package com.cloud.alert; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -36,7 +35,6 @@ import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.dao.SecondaryStorageVmDao; @Component -@Local(value = AlertAdapter.class) public class SecondaryStorageVmAlertAdapter extends AdapterBase implements AlertAdapter { private static final Logger s_logger = Logger.getLogger(SecondaryStorageVmAlertAdapter.class); diff --git a/server/src/com/cloud/api/auth/APIAuthenticationManagerImpl.java b/server/src/com/cloud/api/auth/APIAuthenticationManagerImpl.java index 28a9c0f5d46..c304a10d917 100644 --- a/server/src/com/cloud/api/auth/APIAuthenticationManagerImpl.java +++ b/server/src/com/cloud/api/auth/APIAuthenticationManagerImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -33,7 +32,6 @@ import org.apache.cloudstack.api.auth.PluggableAPIAuthenticator; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ManagerBase; -@Local(value = APIAuthenticationManager.class) @SuppressWarnings("unchecked") public class APIAuthenticationManagerImpl extends ManagerBase implements APIAuthenticationManager { public static final Logger s_logger = Logger.getLogger(APIAuthenticationManagerImpl.class.getName()); diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index f853b673d4a..009518194c9 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.utils.StringUtils; @@ -224,7 +223,6 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; @Component -@Local(value = {QueryService.class}) public class QueryManagerImpl extends ManagerBase implements QueryService, Configurable { public static final Logger s_logger = Logger.getLogger(QueryManagerImpl.class); diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java index fadaed52874..b110478e2fc 100644 --- a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -41,7 +40,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AccountJoinDao.class}) public class AccountJoinDaoImpl extends GenericDaoBase implements AccountJoinDao { public static final Logger s_logger = Logger.getLogger(AccountJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java index cdd389ca72b..3c28106ea6c 100644 --- a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -34,7 +33,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -@Local(value = {AffinityGroupJoinDao.class}) public class AffinityGroupJoinDaoImpl extends GenericDaoBase implements AffinityGroupJoinDao { public static final Logger s_logger = Logger.getLogger(AffinityGroupJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java index 7c6a174b7fb..fefc89677dd 100644 --- a/server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AsyncJobJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AsyncJobJoinDao.class}) public class AsyncJobJoinDaoImpl extends GenericDaoBase implements AsyncJobJoinDao { public static final Logger s_logger = Logger.getLogger(AsyncJobJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java index a4cdb6718ca..97a7497a215 100644 --- a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -40,7 +39,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {DataCenterJoinDao.class}) public class DataCenterJoinDaoImpl extends GenericDaoBase implements DataCenterJoinDao { public static final Logger s_logger = Logger.getLogger(DataCenterJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java index a99f19dd0dd..9ca44872fec 100644 --- a/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {DiskOfferingJoinDao.class}) public class DiskOfferingJoinDaoImpl extends GenericDaoBase implements DiskOfferingJoinDao { public static final Logger s_logger = Logger.getLogger(DiskOfferingJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java index 220f8b64afe..be3f5b4126d 100644 --- a/server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.response.DomainResponse; @@ -35,7 +34,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value={DomainJoinDao.class}) public class DomainJoinDaoImpl extends GenericDaoBase implements DomainJoinDao { public static final Logger s_logger = Logger.getLogger(DomainJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index 52c36e8b5c3..a4ec3e8eaa4 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.response.DomainRouterResponse; @@ -42,7 +41,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {DomainRouterJoinDao.class}) public class DomainRouterJoinDaoImpl extends GenericDaoBase implements DomainRouterJoinDao { public static final Logger s_logger = Logger.getLogger(DomainRouterJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index dca4de18814..970c2b21f1b 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -53,7 +52,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {HostJoinDao.class}) public class HostJoinDaoImpl extends GenericDaoBase implements HostJoinDao { public static final Logger s_logger = Logger.getLogger(HostJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java b/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java index d73deb5b01c..6e5db1d2484 100644 --- a/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostTagDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.response.HostTagResponse; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {HostTagDao.class}) public class HostTagDaoImpl extends GenericDaoBase implements HostTagDao { public static final Logger s_logger = Logger.getLogger(HostTagDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java index b1e5025be50..4add7198f4b 100644 --- a/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ImageStoreJoinDao.class}) public class ImageStoreJoinDaoImpl extends GenericDaoBase implements ImageStoreJoinDao { public static final Logger s_logger = Logger.getLogger(ImageStoreJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java index 3a580a46cd2..d37ece04864 100644 --- a/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.vm.InstanceGroup; @Component -@Local(value = {InstanceGroupJoinDao.class}) public class InstanceGroupJoinDaoImpl extends GenericDaoBase implements InstanceGroupJoinDao { public static final Logger s_logger = Logger.getLogger(InstanceGroupJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java index 676a995fdb2..ad5db14d074 100644 --- a/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ProjectAccountJoinDao.class}) public class ProjectAccountJoinDaoImpl extends GenericDaoBase implements ProjectAccountJoinDao { public static final Logger s_logger = Logger.getLogger(ProjectAccountJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java index 864fcf8ed4f..33a35d97df7 100644 --- a/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -32,7 +31,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ProjectInvitationJoinDao.class}) public class ProjectInvitationJoinDaoImpl extends GenericDaoBase implements ProjectInvitationJoinDao { public static final Logger s_logger = Logger.getLogger(ProjectInvitationJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java index 696487792b7..65330ac29da 100644 --- a/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ProjectJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -40,7 +39,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ProjectJoinDao.class}) public class ProjectJoinDaoImpl extends GenericDaoBase implements ProjectJoinDao { public static final Logger s_logger = Logger.getLogger(ProjectJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java index 3ec10dd8399..e1f6c659269 100644 --- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; @Component -@Local(value = {ResourceTagJoinDao.class}) public class ResourceTagJoinDaoImpl extends GenericDaoBase implements ResourceTagJoinDao { public static final Logger s_logger = Logger.getLogger(ResourceTagJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java index 1c544276e2d..0413d216240 100644 --- a/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.response.ResourceTagResponse; @@ -48,7 +47,6 @@ import com.cloud.vm.UserVmVO; import com.cloud.vm.dao.UserVmDao; @Component -@Local(value = {SecurityGroupJoinDao.class}) public class SecurityGroupJoinDaoImpl extends GenericDaoBase implements SecurityGroupJoinDao { public static final Logger s_logger = Logger.getLogger(SecurityGroupJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java index 4b4c73b9abf..36270696b6b 100644 --- a/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {ServiceOfferingJoinDao.class}) public class ServiceOfferingJoinDaoImpl extends GenericDaoBase implements ServiceOfferingJoinDao { public static final Logger s_logger = Logger.getLogger(ServiceOfferingJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java index ff04c5bc7c3..f51f52e2f8d 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -38,7 +37,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {StoragePoolJoinDao.class}) public class StoragePoolJoinDaoImpl extends GenericDaoBase implements StoragePoolJoinDao { public static final Logger s_logger = Logger.getLogger(StoragePoolJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/StorageTagDaoImpl.java b/server/src/com/cloud/api/query/dao/StorageTagDaoImpl.java index d1511f2d61f..63557d781b1 100644 --- a/server/src/com/cloud/api/query/dao/StorageTagDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/StorageTagDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.response.StorageTagResponse; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {StorageTagDao.class}) public class StorageTagDaoImpl extends GenericDaoBase implements StorageTagDao { public static final Logger s_logger = Logger.getLogger(StorageTagDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 4bb2c95f4b5..5444eca6ba5 100644 --- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -53,7 +52,6 @@ import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {TemplateJoinDao.class}) public class TemplateJoinDaoImpl extends GenericDaoBase implements TemplateJoinDao { public static final Logger s_logger = Logger.getLogger(TemplateJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java index 923a2382fdd..433912bff28 100644 --- a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.api.query.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -33,7 +32,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {UserAccountJoinDao.class}) public class UserAccountJoinDaoImpl extends GenericDaoBase implements UserAccountJoinDao { public static final Logger s_logger = Logger.getLogger(UserAccountJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java index 9d883349d60..7983065f31a 100644 --- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -62,7 +61,6 @@ import com.cloud.vm.dao.NicSecondaryIpVO; import com.cloud.vm.dao.UserVmDetailsDao; @Component -@Local(value = {UserVmJoinDao.class}) public class UserVmJoinDaoImpl extends GenericDaoBase implements UserVmJoinDao { public static final Logger s_logger = Logger.getLogger(UserVmJoinDaoImpl.class); diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 68a578fd218..6d8a8ab5527 100644 --- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.api.query.dao; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.ResponseObject.ResponseView; @@ -43,7 +42,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {VolumeJoinDao.class}) public class VolumeJoinDaoImpl extends GenericDaoBase implements VolumeJoinDao { public static final Logger s_logger = Logger.getLogger(VolumeJoinDaoImpl.class); diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 541c8475fb8..55ed9171c98 100644 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -101,7 +100,6 @@ import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.snapshot.dao.VMSnapshotDao; -@Local(value = CapacityManager.class) public class CapacityManagerImpl extends ManagerBase implements CapacityManager, StateListener, Listener, ResourceListener, Configurable { private static final Logger s_logger = Logger.getLogger(CapacityManagerImpl.class); diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index ccbc0b0ef06..f17b948c6b2 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -31,7 +31,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -216,7 +215,6 @@ import com.cloud.vm.dao.NicIpAliasVO; import com.cloud.vm.dao.NicSecondaryIpDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = {ConfigurationManager.class, ConfigurationService.class}) public class ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService, Configurable { public static final Logger s_logger = Logger.getLogger(ConfigurationManagerImpl.class); diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java index 6824b9c731a..487ec45a424 100644 --- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java @@ -18,7 +18,6 @@ package com.cloud.consoleproxy; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -46,7 +45,6 @@ import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = {ConsoleProxyManager.class}) public class AgentBasedConsoleProxyManager extends ManagerBase implements ConsoleProxyManager { 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 869af13aced..b473f7e7f38 100644 --- a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java @@ -18,7 +18,6 @@ package com.cloud.consoleproxy; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -27,7 +26,6 @@ import com.cloud.host.HostVO; import com.cloud.info.ConsoleProxyInfo; import com.cloud.vm.UserVmVO; -@Local(value = {ConsoleProxyManager.class}) public class AgentBasedStandaloneConsoleProxyManager extends AgentBasedConsoleProxyManager { private static final Logger s_logger = Logger.getLogger(AgentBasedStandaloneConsoleProxyManager.class); diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java index 2cbd847845c..9df465472f1 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java @@ -22,13 +22,11 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.ConsoleProxy; -@Local(value = {ConsoleProxyAllocator.class}) public class ConsoleProxyBalanceAllocator extends AdapterBase implements ConsoleProxyAllocator { @Override diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 54ae38248de..f3766c339c4 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -26,7 +26,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -152,7 +151,6 @@ 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 // -@Local(value = {ConsoleProxyManager.class, ConsoleProxyService.class}) public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager, 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 8aa9b0dfbb2..bb2b426bf82 100644 --- a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java @@ -19,7 +19,6 @@ package com.cloud.consoleproxy; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -38,7 +37,6 @@ import com.cloud.utils.NumbersUtil; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.ConsoleProxyDao; -@Local(value = {ConsoleProxyManager.class}) public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager implements ConsoleProxyManager, ResourceStateAdapter { @Inject diff --git a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java index e7ef2e8cbb1..8f51783c8b0 100644 --- a/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.dc.dao; import java.util.List; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {DedicatedResourceDao.class}) @DB public class DedicatedResourceDaoImpl extends GenericDaoBase implements DedicatedResourceDao { protected final SearchBuilder ZoneSearch; diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java index 8b9be259044..f5d2af92be5 100644 --- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -27,7 +27,6 @@ import java.util.Set; import java.util.Timer; import java.util.TreeSet; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -133,7 +132,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = {DeploymentPlanningManager.class}) public class DeploymentPlanningManagerImpl extends ManagerBase implements DeploymentPlanningManager, Manager, Listener, StateListener { diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index 8fa25bd5960..cffff275c5c 100644 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -68,7 +67,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = DeploymentPlanner.class) public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPlanner, Configurable { private static final Logger s_logger = Logger.getLogger(FirstFitPlanner.class); @Inject diff --git a/server/src/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java b/server/src/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java index 074c621ed03..b7373ea77f2 100644 --- a/server/src/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java +++ b/server/src/com/cloud/deploy/dao/PlannerHostReservationDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.deploy.dao; import java.util.List; import javax.annotation.PostConstruct; -import javax.ejb.Local; import com.cloud.deploy.DeploymentPlanner.PlannerResourceUsage; import com.cloud.deploy.PlannerHostReservationVO; @@ -27,7 +26,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -@Local(value = {PlannerHostReservationDao.class}) public class PlannerHostReservationDaoImpl extends GenericDaoBase implements PlannerHostReservationDao { private SearchBuilder _hostIdSearch; diff --git a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java index 313c3725148..8a78a6934f2 100644 --- a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java +++ b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.event.dao; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -35,7 +34,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {EventJoinDao.class}) public class EventJoinDaoImpl extends GenericDaoBase implements EventJoinDao { public static final Logger s_logger = Logger.getLogger(EventJoinDaoImpl.class); diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java index b2e333fbf92..f6409a5c0bd 100644 --- a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java +++ b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.ha; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -32,7 +31,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.PowerState; -@Local(value = Investigator.class) public class CheckOnAgentInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(CheckOnAgentInvestigator.class); @Inject diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java index 56db8ef2f26..8f3e7dd48a5 100644 --- a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java @@ -20,7 +20,6 @@ import java.util.Date; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -31,7 +30,6 @@ import com.cloud.alert.AlertManager; import com.cloud.usage.dao.UsageJobDao; import com.cloud.utils.db.TransactionLegacy; -@Local(value = {HighAvailabilityManager.class}) public class HighAvailabilityManagerExtImpl extends HighAvailabilityManagerImpl { @Inject diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index cce44578929..bec1e2a1319 100644 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -25,7 +25,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -101,7 +100,6 @@ 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 || * } **/ -@Local(value = { HighAvailabilityManager.class }) public class HighAvailabilityManagerImpl extends ManagerBase 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 b5834efe91a..3f06872b56f 100644 --- a/server/src/com/cloud/ha/KVMFencer.java +++ b/server/src/com/cloud/ha/KVMFencer.java @@ -19,7 +19,6 @@ package com.cloud.ha; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -40,7 +39,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value = FenceBuilder.class) public class KVMFencer extends AdapterBase 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 9f361b0de63..ec7f4aa72df 100644 --- a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java +++ b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java @@ -18,7 +18,6 @@ package com.cloud.ha; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -32,7 +31,6 @@ import com.cloud.network.Networks.TrafficType; import com.cloud.vm.Nic; import com.cloud.vm.VirtualMachine; -@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 4aa74385dff..668d13fa498 100644 --- a/server/src/com/cloud/ha/RecreatableFencer.java +++ b/server/src/com/cloud/ha/RecreatableFencer.java @@ -18,7 +18,6 @@ package com.cloud.ha; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -33,7 +32,6 @@ import com.cloud.utils.component.AdapterBase; 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); @Inject diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/com/cloud/ha/UserVmDomRInvestigator.java index 63d9bf055c1..451c5d467a1 100644 --- a/server/src/com/cloud/ha/UserVmDomRInvestigator.java +++ b/server/src/com/cloud/ha/UserVmDomRInvestigator.java @@ -19,7 +19,6 @@ package com.cloud.ha; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -39,7 +38,6 @@ import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.dao.UserVmDao; -@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 07eb76be193..89664217665 100644 --- a/server/src/com/cloud/ha/XenServerInvestigator.java +++ b/server/src/com/cloud/ha/XenServerInvestigator.java @@ -18,7 +18,6 @@ package com.cloud.ha; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; import com.cloud.vm.VirtualMachine; -@Local(value = Investigator.class) public class XenServerInvestigator extends AdapterBase implements Investigator { private final static Logger s_logger = Logger.getLogger(XenServerInvestigator.class); @Inject diff --git a/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java b/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java index 724f4f6d7c9..3d11eb04f53 100644 --- a/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java +++ b/server/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.ha.dao; import java.util.Date; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.db.TransactionLegacy; 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/hypervisor/CloudZonesStartupProcessor.java b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java index d407b844a7c..4bdb2bc1d47 100644 --- a/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java +++ b/server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java @@ -19,7 +19,6 @@ package com.cloud.hypervisor; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -59,7 +58,6 @@ import com.cloud.utils.net.NetUtils; * */ @Component -@Local(value = StartupCommandProcessor.class) public class CloudZonesStartupProcessor extends AdapterBase implements StartupCommandProcessor { private static final Logger s_logger = Logger.getLogger(CloudZonesStartupProcessor.class); @Inject diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java index 4dcd703370f..243bbe43191 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -35,7 +34,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; @Component -@Local(value = {HypervisorGuruManager.class}) public class HypervisorGuruManagerImpl extends ManagerBase 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 e15a41752e6..1a476a2948d 100644 --- a/server/src/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/com/cloud/hypervisor/KVMGuru.java @@ -32,11 +32,9 @@ import com.cloud.vm.VirtualMachineProfile; import org.apache.cloudstack.storage.command.CopyCommand; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; -import javax.ejb.Local; import javax.inject.Inject; import java.util.Map; -@Local(value = HypervisorGuru.class) public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/server/src/com/cloud/hypervisor/LXCGuru.java b/server/src/com/cloud/hypervisor/LXCGuru.java index 2becdbd79e6..285f9628d8d 100644 --- a/server/src/com/cloud/hypervisor/LXCGuru.java +++ b/server/src/com/cloud/hypervisor/LXCGuru.java @@ -18,7 +18,6 @@ package com.cloud.hypervisor; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.api.to.VirtualMachineTO; @@ -31,7 +30,6 @@ import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.GuestOSHypervisorDao; import com.cloud.vm.VirtualMachineProfile; -@Local(value = HypervisorGuru.class) public class LXCGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index cf552044396..6e29de2b2ba 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -16,14 +16,11 @@ // under the License. package com.cloud.hypervisor.kvm.discoverer; -import javax.ejb.Local; import org.apache.log4j.Logger; import com.cloud.hypervisor.Hypervisor; -import com.cloud.resource.Discoverer; -@Local(value = Discoverer.class) public class KvmServerDiscoverer extends LibvirtServerDiscoverer { private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class); diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java index dff89c8932a..16ac97d64dd 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java @@ -16,14 +16,11 @@ // under the License. package com.cloud.hypervisor.kvm.discoverer; -import javax.ejb.Local; import org.apache.log4j.Logger; import com.cloud.hypervisor.Hypervisor; -import com.cloud.resource.Discoverer; -@Local(value = Discoverer.class) public class LxcServerDiscoverer extends LibvirtServerDiscoverer { private static final Logger s_logger = Logger.getLogger(LxcServerDiscoverer.class); diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java index 812630ab8b0..0c006066e6f 100644 --- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java +++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -68,7 +67,6 @@ import com.cloud.vm.dao.NicDetailsDao; import com.cloud.vm.dao.UserVmDetailsDao; @Component -@Local(value = {ResourceMetaDataService.class, ResourceMetaDataManager.class}) public class ResourceMetaDataManagerImpl extends ManagerBase implements ResourceMetaDataService, ResourceMetaDataManager { public static final Logger s_logger = Logger.getLogger(ResourceMetaDataManagerImpl.class); @Inject diff --git a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java index 9e53341db06..59b398f5b5e 100644 --- a/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java +++ b/server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java @@ -25,7 +25,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -90,7 +89,6 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; @Component -@Local(value = {ExternalDeviceUsageManager.class}) public class ExternalDeviceUsageManagerImpl extends ManagerBase implements ExternalDeviceUsageManager { String _name; diff --git a/server/src/com/cloud/network/ExternalIpAddressAllocator.java b/server/src/com/cloud/network/ExternalIpAddressAllocator.java index 58b30f4d57b..fe55ea97890 100644 --- a/server/src/com/cloud/network/ExternalIpAddressAllocator.java +++ b/server/src/com/cloud/network/ExternalIpAddressAllocator.java @@ -26,7 +26,6 @@ import java.net.URL; import java.net.URLConnection; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -39,7 +38,6 @@ import com.cloud.network.dao.IPAddressDao; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.exception.CloudRuntimeException; -@Local(value = IpAddrAllocator.class) public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAllocator { private static final Logger s_logger = Logger.getLogger(ExternalIpAddressAllocator.class); @Inject diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index bf9327f6993..fd55a89e5c8 100644 --- a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -65,7 +64,6 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; @Component -@Local(value = {ExternalNetworkDeviceManager.class}) public class ExternalNetworkDeviceManagerImpl extends ManagerBase implements ExternalNetworkDeviceManager { @Inject diff --git a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java index d8a9d686cd4..d14734968f8 100644 --- a/server/src/com/cloud/network/Ipv6AddressManagerImpl.java +++ b/server/src/com/cloud/network/Ipv6AddressManagerImpl.java @@ -20,7 +20,6 @@ package com.cloud.network; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -44,7 +43,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; -@Local(value = {Ipv6AddressManager.class}) public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressManager { public static final Logger s_logger = Logger.getLogger(Ipv6AddressManagerImpl.class.getName()); diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java index 154e666c7a3..f3e25e8695b 100644 --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -125,7 +124,6 @@ import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicSecondaryIpDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = {NetworkModel.class}) public class NetworkModelImpl extends ManagerBase implements NetworkModel { static final Logger s_logger = Logger.getLogger(NetworkModelImpl.class); @Inject diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index a99d996f3e4..e5c13859d66 100644 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -36,7 +36,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -197,7 +196,6 @@ import com.cloud.vm.dao.VMInstanceDao; /** * NetworkServiceImpl implements NetworkService. */ -@Local(value = {NetworkService.class}) public class NetworkServiceImpl extends ManagerBase implements NetworkService { private static final Logger s_logger = Logger.getLogger(NetworkServiceImpl.class); diff --git a/server/src/com/cloud/network/NetworkUsageManagerImpl.java b/server/src/com/cloud/network/NetworkUsageManagerImpl.java index fa4eb167d30..a0356ca90be 100644 --- a/server/src/com/cloud/network/NetworkUsageManagerImpl.java +++ b/server/src/com/cloud/network/NetworkUsageManagerImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -93,7 +92,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.MacAddress; @Component -@Local(value = {NetworkUsageManager.class}) public class NetworkUsageManagerImpl extends ManagerBase implements NetworkUsageService, NetworkUsageManager, ResourceStateAdapter { public enum NetworkUsageResourceName { TrafficSentinel; diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java index 1e6616f753a..d72de44885b 100644 --- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java +++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -59,7 +58,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.dao.SecondaryStorageVmDao; @Component -@Local(value = {StorageNetworkManager.class, StorageNetworkService.class}) public class StorageNetworkManagerImpl extends ManagerBase implements StorageNetworkManager, StorageNetworkService { private static final Logger s_logger = Logger.getLogger(StorageNetworkManagerImpl.class); diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 01c1486dfa6..657d4d4b88e 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -27,7 +27,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -125,7 +124,6 @@ import com.cloud.utils.net.NetUtils; import com.cloud.vm.UserVmManager; import com.cloud.vm.UserVmService; -@Local(value = {AutoScaleService.class, AutoScaleManager.class}) public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManager, AutoScaleService { private static final Logger s_logger = Logger.getLogger(AutoScaleManagerImpl.class); private ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1); diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java index 5dfc127c8a1..cb3fac821e0 100644 --- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java +++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -60,7 +59,6 @@ import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; -@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/SecurityGroupElement.java b/server/src/com/cloud/network/element/SecurityGroupElement.java index 356feced590..86c862bf072 100644 --- a/server/src/com/cloud/network/element/SecurityGroupElement.java +++ b/server/src/com/cloud/network/element/SecurityGroupElement.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; @@ -38,7 +37,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@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 2a1dd403977..ce96b14cd55 100644 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.command.admin.router.ConfigureOvsElementCmd; @@ -109,8 +108,6 @@ import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.UserVmDao; import com.google.gson.Gson; -@Local(value = { NetworkElement.class, FirewallServiceProvider.class, DhcpServiceProvider.class, UserDataServiceProvider.class, StaticNatServiceProvider.class, - LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, RemoteAccessVPNServiceProvider.class, NetworkMigrationResponder.class }) public class VirtualRouterElement extends AdapterBase implements VirtualRouterElementService, DhcpServiceProvider, UserDataServiceProvider, SourceNatServiceProvider, StaticNatServiceProvider, FirewallServiceProvider, LoadBalancingServiceProvider, PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, NetworkMigrationResponder, AggregatedCommandExecutor { diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java index 078eab3d885..8d25ae9c0d5 100644 --- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.network.topology.NetworkTopology; @@ -78,9 +77,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineProfile; -@Local(value = { NetworkElement.class, FirewallServiceProvider.class, DhcpServiceProvider.class, UserDataServiceProvider.class, StaticNatServiceProvider.class, - LoadBalancingServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, VpcProvider.class, Site2SiteVpnServiceProvider.class, - NetworkACLServiceProvider.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 39fc33c8366..b7e0d1412d0 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -98,7 +97,6 @@ import com.cloud.vm.UserVmVO; import com.cloud.vm.dao.UserVmDao; @Component -@Local(value = {FirewallService.class, FirewallManager.class}) public class FirewallManagerImpl extends ManagerBase implements FirewallService, FirewallManager, NetworkRuleApplier { 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 5e80bea0a17..4e3a98166ea 100644 --- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java @@ -18,7 +18,6 @@ package com.cloud.network.guru; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -53,7 +52,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkGuru.class}) public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru { private static final Logger s_logger = Logger.getLogger(ControlNetworkGuru.class); @Inject diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index 018ab906ebc..f7416516b30 100644 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -18,7 +18,6 @@ package com.cloud.network.guru; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; @@ -73,7 +72,6 @@ import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicSecondaryIpDao; -@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 26c80151add..9154ece5079 100644 --- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java @@ -18,7 +18,6 @@ package com.cloud.network.guru; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -62,7 +61,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@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 b1d123669cc..a5838ecb392 100644 --- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java @@ -18,7 +18,6 @@ package com.cloud.network.guru; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.context.CallContext; @@ -65,7 +64,6 @@ import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkGuru.class) public class ExternalGuestNetworkGuru extends GuestNetworkGuru { private static final Logger s_logger = Logger.getLogger(ExternalGuestNetworkGuru.class); @Inject diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index 92613c47482..f6aeeab197f 100644 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.context.CallContext; @@ -82,7 +81,6 @@ import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.NicDao; -@Local(value = NetworkGuru.class) public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGuru, Configurable { 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 2470ea7c67b..9bffe2c0860 100644 --- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java @@ -18,7 +18,6 @@ package com.cloud.network.guru; import java.util.Random; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -48,7 +47,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = {NetworkGuru.class}) public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru { private static final Logger s_logger = Logger.getLogger(PodBasedNetworkGuru.class); @Inject diff --git a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java index 340c8b12524..be3c6e41e5d 100644 --- a/server/src/com/cloud/network/guru/PrivateNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PrivateNetworkGuru.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.guru; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -54,7 +53,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkGuru.class) public class PrivateNetworkGuru extends AdapterBase implements NetworkGuru { private static final Logger s_logger = Logger.getLogger(PrivateNetworkGuru.class); @Inject diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index 9f855ea116d..c27543dbbdb 100644 --- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.guru; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; @@ -58,7 +57,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; -@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 bf21cd77160..f6c8dec5211 100644 --- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java +++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network.guru; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -44,7 +43,6 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachineProfile; -@Local(value = NetworkGuru.class) public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGuru { private static final Logger s_logger = Logger.getLogger(StorageNetworkGuru.class); @Inject diff --git a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java index 84ac061b40c..d8ad4d42833 100644 --- a/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java +++ b/server/src/com/cloud/network/lb/LBHealthCheckManagerImpl.java @@ -23,7 +23,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -42,7 +41,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; @Component -@Local(value = {LBHealthCheckManager.class}) public class LBHealthCheckManagerImpl extends ManagerBase implements LBHealthCheckManager, Manager { private static final Logger s_logger = Logger.getLogger(LBHealthCheckManagerImpl.class); diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index c03af2d3fad..402984329d5 100644 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.ApiConstants; @@ -168,7 +167,6 @@ import com.cloud.vm.dao.UserVmDao; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -@Local(value = {LoadBalancingRulesManager.class, LoadBalancingRulesService.class}) public class LoadBalancingRulesManagerImpl extends ManagerBase implements LoadBalancingRulesManager, LoadBalancingRulesService { 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 ca1f67dbb69..419537fbdbe 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -39,7 +39,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -249,7 +248,6 @@ import com.cloud.vm.dao.VMInstanceDao; * VirtualNetworkApplianceManagerImpl manages the different types of virtual * network appliances available in the Cloud Stack. */ -@Local(value = { VirtualNetworkApplianceManager.class, VirtualNetworkApplianceService.class }) public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, VirtualMachineGuru, Listener, Configurable, StateListener { private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class); diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index a13ff218d46..712c7472393 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -56,7 +55,6 @@ import com.cloud.network.PublicIpAddress; import com.cloud.network.RemoteAccessVpn; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.network.VirtualRouterProvider; -import com.cloud.network.VpcVirtualNetworkApplianceService; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.RemoteAccessVpnVO; @@ -94,7 +92,6 @@ 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 3e2b15af22e..b4f7217a490 100644 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd; @@ -97,7 +96,6 @@ import com.cloud.vm.dao.NicSecondaryIpVO; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = {RulesManager.class, RulesService.class}) public class RulesManagerImpl extends ManagerBase implements RulesManager, RulesService { private static final Logger s_logger = Logger.getLogger(RulesManagerImpl.class); diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 097118dd45c..442747a5933 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -36,7 +36,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import javax.ejb.ConcurrentAccessException; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -122,7 +121,6 @@ import com.cloud.vm.dao.NicSecondaryIpDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; -@Local(value = {SecurityGroupManager.class, SecurityGroupService.class}) public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGroupManager, SecurityGroupService, 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 47f6e774bac..64204fe9a7a 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java @@ -24,7 +24,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -48,7 +47,6 @@ import com.cloud.vm.VirtualMachine.State; * Same as the base class -- except it uses the abstracted security group work queue * */ -@Local(value = {SecurityGroupManager.class, SecurityGroupService.class}) public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl { SecurityGroupWorkQueue _workQueue = new LocalSecurityGroupWorkQueue(); SecurityGroupWorkTracker _workTracker; diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java index de0465b8e76..fe0d7773dff 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.network.vpc; import java.util.ArrayList; import java.util.List; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.cloudstack.context.CallContext; @@ -53,7 +52,6 @@ import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; -@Local(value = {NetworkACLManager.class}) public class NetworkACLManagerImpl extends ManagerBase implements NetworkACLManager { private static final Logger s_logger = Logger.getLogger(NetworkACLManagerImpl.class); diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index 9f61f08c4cb..60f5d7b4e72 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.commons.lang.StringUtils; @@ -65,7 +64,6 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; @Component -@Local(value = {NetworkACLService.class}) public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLService { private static final Logger s_logger = Logger.getLogger(NetworkACLServiceImpl.class); diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 2a078954bde..bb857e44e51 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -36,7 +36,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -143,7 +142,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.ReservationContextImpl; import com.cloud.vm.dao.DomainRouterDao; -@Local(value = {VpcManager.class, VpcService.class, VpcProvisioningService.class}) public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvisioningService, VpcService { private static final Logger s_logger = Logger.getLogger(VpcManagerImpl.class); diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 3c0188d6486..b473f050e04 100644 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -21,7 +21,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -92,7 +91,6 @@ import com.cloud.utils.db.TransactionCallbackWithException; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.net.NetUtils; -@Local(value = RemoteAccessVpnService.class) public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAccessVpnService, Configurable { 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 b3cec12925f..deebc6d9d1c 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -81,7 +80,6 @@ import com.cloud.utils.net.NetUtils; import com.cloud.vm.DomainRouterVO; @Component -@Local(value = {Site2SiteVpnManager.class, Site2SiteVpnService.class}) public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpnManager { private static final Logger s_logger = Logger.getLogger(Site2SiteVpnManagerImpl.class); diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java index 95cf68a354a..ee6650698c3 100644 --- a/server/src/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/com/cloud/projects/ProjectManagerImpl.java @@ -28,7 +28,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.mail.Authenticator; import javax.mail.Message.RecipientType; @@ -93,7 +92,6 @@ import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {ProjectService.class, ProjectManager.class}) public class ProjectManagerImpl extends ManagerBase implements ProjectManager { public static final Logger s_logger = Logger.getLogger(ProjectManagerImpl.class); private EmailInvite _emailInvite; diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/com/cloud/resource/DummyHostDiscoverer.java index 4651498d997..88f87889ad8 100644 --- a/server/src/com/cloud/resource/DummyHostDiscoverer.java +++ b/server/src/com/cloud/resource/DummyHostDiscoverer.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; @@ -33,7 +32,6 @@ import com.cloud.hypervisor.Hypervisor; import com.cloud.utils.component.AdapterBase; @Component -@Local(value = Discoverer.class) public class DummyHostDiscoverer extends AdapterBase 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 b450e31f83a..359bccf034c 100644 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -26,7 +26,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -172,7 +171,6 @@ import com.cloud.vm.dao.VMInstanceDao; import com.google.gson.Gson; @Component -@Local({ResourceManager.class, ResourceService.class}) public class ResourceManagerImpl extends ManagerBase 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 1651ad7ba28..25afd0115ea 100644 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -26,7 +26,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -108,7 +107,6 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; @Component -@Local(value = {ResourceLimitService.class}) public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService { public static final Logger s_logger = Logger.getLogger(ResourceLimitManagerImpl.class); diff --git a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java index ea8e87b480b..36f2db8fb14 100644 --- a/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java +++ b/server/src/com/cloud/server/auth/DefaultUserAuthenticator.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.server.auth; -import javax.ejb.Local; import com.cloud.utils.component.AdapterBase; @@ -24,6 +23,5 @@ import com.cloud.utils.component.AdapterBase; * Use this UserAuthenticator if users are already authenticated outside * */ -@Local(value = {UserAuthenticator.class}) public abstract class DefaultUserAuthenticator extends AdapterBase implements UserAuthenticator { } diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java index 8b462d37253..14789104130 100755 --- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java +++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java @@ -22,7 +22,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -77,7 +76,6 @@ import com.cloud.utils.fsm.StateMachine2; * Monitors the progress of upload. */ @Component -@Local(value = {ImageStoreUploadMonitor.class}) public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageStoreUploadMonitor, Listener, Configurable { static final Logger s_logger = Logger.getLogger(ImageStoreUploadMonitorImpl.class); diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java index 017ce7fac83..8d083cb75ba 100644 --- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java +++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -53,7 +52,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {OCFS2Manager.class}) public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, ResourceListener { private static final Logger s_logger = Logger.getLogger(OCFS2ManagerImpl.class); diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 41f00197ad2..87ff9135f5e 100644 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -37,7 +37,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -189,7 +188,6 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.VMInstanceDao; @Component -@Local(value = {StorageManager.class, StorageService.class}) public class StorageManagerImpl extends ManagerBase implements StorageManager, ClusterManagerListener { private static final Logger s_logger = Logger.getLogger(StorageManagerImpl.class); diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index 65471dd624c..68be52d842f 100644 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Timer; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -65,7 +64,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.exception.CloudRuntimeException; @Component -@Local(value = {DownloadMonitor.class}) public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor { static final Logger s_logger = Logger.getLogger(DownloadMonitorImpl.class); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java index 28f6dc4d507..711d1a90497 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmDefaultAllocator.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.ejb.Local; import org.springframework.stereotype.Component; @@ -28,7 +27,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.SecondaryStorageVmVO; @Component -@Local(value = {SecondaryStorageVmAllocator.class}) public class SecondaryStorageVmDefaultAllocator extends AdapterBase implements SecondaryStorageVmAllocator { private String _name; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index fb8889f274a..65f51404182 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -130,7 +129,6 @@ import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; @Component -@Local(value = {SnapshotManager.class, SnapshotApiService.class}) public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, SnapshotApiService { private static final Logger s_logger = Logger.getLogger(SnapshotManagerImpl.class); @Inject diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index 4ce2bba498e..f6c137916fe 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -67,7 +66,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {SnapshotScheduler.class}) public class SnapshotSchedulerImpl extends ManagerBase implements SnapshotScheduler { private static final Logger s_logger = Logger.getLogger(SnapshotSchedulerImpl.class); diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java index 35cb665e667..e8f2980a082 100644 --- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java +++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java @@ -28,7 +28,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -81,7 +80,6 @@ import com.cloud.vm.dao.SecondaryStorageVmDao; * Monitors the progress of upload. */ @Component -@Local(value = {UploadMonitor.class}) public class UploadMonitorImpl extends ManagerBase implements UploadMonitor { static final Logger s_logger = Logger.getLogger(UploadMonitorImpl.class); diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index dfe3ae0405f..08ed3dd1f71 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -89,7 +88,6 @@ import com.cloud.vm.NicVO; import com.cloud.vm.UserVmVO; import com.cloud.vm.snapshot.VMSnapshotVO; -@Local(value = {TaggedResourceService.class}) public class TaggedResourceManagerImpl extends ManagerBase implements TaggedResourceService { public static final Logger s_logger = Logger.getLogger(TaggedResourceManagerImpl.class); diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java index 0b7854e4bfb..13649745ec2 100644 --- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ExecutionException; -import javax.ejb.Local; import javax.inject.Inject; import com.cloud.configuration.Config; @@ -86,7 +85,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; import com.cloud.utils.exception.CloudRuntimeException; -@Local(value = TemplateAdapter.class) public class HypervisorTemplateAdapter extends TemplateAdapterBase { private final static Logger s_logger = Logger.getLogger(HypervisorTemplateAdapter.class); @Inject diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index aaa86e40d2f..6a8c3b61423 100644 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -29,7 +29,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -194,7 +193,6 @@ import com.cloud.vm.dao.VMInstanceDao; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -@Local(value = {TemplateManager.class, TemplateApiService.class}) public class TemplateManagerImpl extends ManagerBase implements TemplateManager, TemplateApiService, Configurable { private final static Logger s_logger = Logger.getLogger(TemplateManagerImpl.class); diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java index df43a009dbb..efd8ef4b8ad 100644 --- a/server/src/com/cloud/usage/UsageServiceImpl.java +++ b/server/src/com/cloud/usage/UsageServiceImpl.java @@ -67,7 +67,6 @@ import org.apache.cloudstack.usage.UsageTypes; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; import java.util.ArrayList; @@ -78,7 +77,6 @@ import java.util.Map; import java.util.TimeZone; @Component -@Local(value = {UsageService.class}) public class UsageServiceImpl extends ManagerBase implements UsageService, Manager { public static final Logger s_logger = Logger.getLogger(UsageServiceImpl.class); diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 8f3a1b2ca24..da097378e16 100644 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -35,7 +35,6 @@ import javax.crypto.KeyGenerator; import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -169,7 +168,6 @@ import com.cloud.vm.snapshot.VMSnapshotManager; import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; -@Local(value = {AccountManager.class, AccountService.class}) public class AccountManagerImpl extends ManagerBase implements AccountManager, 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 fbbe0c28704..912aa8b73ad 100644 --- a/server/src/com/cloud/user/DomainManagerImpl.java +++ b/server/src/com/cloud/user/DomainManagerImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -76,7 +75,6 @@ import com.cloud.vm.ReservationContext; import com.cloud.vm.ReservationContextImpl; @Component -@Local(value = {DomainManager.class, DomainService.class}) public class DomainManagerImpl extends ManagerBase implements DomainManager, DomainService { public static final Logger s_logger = Logger.getLogger(DomainManagerImpl.class); diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 32b0d3d3748..49250fb3bbe 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -33,7 +33,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -284,7 +283,6 @@ import com.cloud.vm.snapshot.VMSnapshotManager; import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; -@Local(value = {UserVmManager.class, UserVmService.class}) public class UserVmManagerImpl extends ManagerBase implements UserVmManager, VirtualMachineGuru, UserVmService, Configurable { private static final Logger s_logger = Logger.getLogger(UserVmManagerImpl.class); diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index 2dcd2e27b5a..c113e3c9203 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -100,7 +99,6 @@ import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.snapshot.dao.VMSnapshotDao; @Component -@Local(value = { VMSnapshotManager.class, VMSnapshotService.class }) public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotManager, VMSnapshotService, VmWorkJobHandler { private static final Logger s_logger = Logger.getLogger(VMSnapshotManagerImpl.class); diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java index d25bddb4398..85658e5d7d4 100644 --- a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -70,7 +69,6 @@ import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmDao; -@Local(value = {AffinityGroupService.class}) public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGroupService, Manager, StateListener { public static final Logger s_logger = Logger.getLogger(AffinityGroupServiceImpl.class); diff --git a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java index bc2f1c4da47..1c9af7a334d 100644 --- a/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java +++ b/server/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerManagerImpl.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import org.apache.log4j.Logger; @@ -79,7 +78,6 @@ import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; @Component -@Local(value = {ApplicationLoadBalancerService.class}) public class ApplicationLoadBalancerManagerImpl extends ManagerBase implements ApplicationLoadBalancerService { private static final Logger s_logger = Logger.getLogger(ApplicationLoadBalancerManagerImpl.class); diff --git a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java index 89107141966..7e7189e09ee 100644 --- a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java +++ b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -48,7 +47,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DbProperties; @Component -@Local(value = {RegionManager.class}) public class RegionManagerImpl extends ManagerBase implements RegionManager, Manager { public static final Logger s_logger = Logger.getLogger(RegionManagerImpl.class); diff --git a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java index 98cf5005f89..cd3a147a9ac 100644 --- a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.region; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -47,7 +46,6 @@ import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; @Component -@Local(value = {RegionService.class}) public class RegionServiceImpl extends ManagerBase implements RegionService, Manager { public static final Logger s_logger = Logger.getLogger(RegionServiceImpl.class); diff --git a/server/test/com/cloud/alert/MockAlertManagerImpl.java b/server/test/com/cloud/alert/MockAlertManagerImpl.java index 597d479e6ca..d0b4ac23359 100644 --- a/server/test/com/cloud/alert/MockAlertManagerImpl.java +++ b/server/test/com/cloud/alert/MockAlertManagerImpl.java @@ -19,12 +19,10 @@ package com.cloud.alert; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.utils.component.ManagerBase; -@Local(value = {AlertManager.class}) public class MockAlertManagerImpl extends ManagerBase implements AlertManager { /* (non-Javadoc) diff --git a/server/test/com/cloud/network/MockFirewallManagerImpl.java b/server/test/com/cloud/network/MockFirewallManagerImpl.java index 52090695bac..4c9879890b3 100644 --- a/server/test/com/cloud/network/MockFirewallManagerImpl.java +++ b/server/test/com/cloud/network/MockFirewallManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.network; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.user.firewall.IListFirewallRulesCmd; @@ -38,7 +37,6 @@ import com.cloud.user.Account; import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; -@Local(value = {FirewallManager.class, FirewallService.class}) public class MockFirewallManagerImpl extends ManagerBase implements FirewallManager, FirewallService { @Override diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java index 5c89a161bb7..c00d83f7265 100644 --- a/server/test/com/cloud/network/MockNetworkModelImpl.java +++ b/server/test/com/cloud/network/MockNetworkModelImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.dc.Vlan; @@ -48,7 +47,6 @@ import com.cloud.vm.Nic; import com.cloud.vm.NicProfile; import com.cloud.vm.VirtualMachine; -@Local(value = {NetworkModel.class}) public class MockNetworkModelImpl extends ManagerBase implements NetworkModel { /* (non-Javadoc) diff --git a/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java b/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java index 0d4a550cfa9..0156afb58df 100644 --- a/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java +++ b/server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java @@ -19,7 +19,6 @@ package com.cloud.network.vpn; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.exception.ResourceUnavailableException; @@ -28,7 +27,6 @@ import com.cloud.network.VpnUser; import com.cloud.network.element.RemoteAccessVPNServiceProvider; import com.cloud.utils.component.ManagerBase; -@Local(value = RemoteAccessVPNServiceProvider.class) public class MockRemoteAccessVPNServiceProvider extends ManagerBase implements RemoteAccessVPNServiceProvider { @Override diff --git a/server/test/com/cloud/projects/MockProjectManagerImpl.java b/server/test/com/cloud/projects/MockProjectManagerImpl.java index dc377ff6f42..46946aac71b 100644 --- a/server/test/com/cloud/projects/MockProjectManagerImpl.java +++ b/server/test/com/cloud/projects/MockProjectManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.projects; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.exception.ConcurrentOperationException; @@ -29,7 +28,6 @@ import com.cloud.projects.ProjectAccount.Role; import com.cloud.user.Account; import com.cloud.utils.component.ManagerBase; -@Local(value = {ProjectManager.class}) public class MockProjectManagerImpl extends ManagerBase implements ProjectManager { @Override diff --git a/server/test/com/cloud/resource/MockResourceManagerImpl.java b/server/test/com/cloud/resource/MockResourceManagerImpl.java index d4f2210417d..86de140b977 100644 --- a/server/test/com/cloud/resource/MockResourceManagerImpl.java +++ b/server/test/com/cloud/resource/MockResourceManagerImpl.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; @@ -57,7 +56,6 @@ import com.cloud.resource.ResourceState.Event; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.fsm.NoTransitionException; -@Local(value = {ResourceManager.class}) public class MockResourceManagerImpl extends ManagerBase implements ResourceManager { /* (non-Javadoc) diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index 546cc394d34..3971fd6b4fc 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.net.InetAddress; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; @@ -49,7 +48,6 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @Component -@Local(value = {AccountManager.class, AccountService.class}) public class MockAccountManagerImpl extends ManagerBase implements Manager, AccountManager { @Override diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/test/com/cloud/user/MockDomainManagerImpl.java index 7dddefbcf3f..cdae887cee6 100644 --- a/server/test/com/cloud/user/MockDomainManagerImpl.java +++ b/server/test/com/cloud/user/MockDomainManagerImpl.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; @@ -36,7 +35,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; @Component -@Local(value = {DomainManager.class, DomainService.class}) public class MockDomainManagerImpl extends ManagerBase implements DomainManager, DomainService { @Override diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index fc535bdaa32..ee315bdc640 100644 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -83,7 +82,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; @Component -@Local(value = {ConfigurationManager.class, ConfigurationService.class}) public class MockConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService { @Inject NetworkOfferingDaoImpl _ntwkOffDao; diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 111df93b2b0..a5d8a1ab584 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -21,7 +21,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -82,7 +81,6 @@ import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = {NetworkOrchestrationService.class, NetworkService.class}) public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrchestrationService, NetworkService { @Inject NetworkServiceMapDao _ntwkSrvcDao; diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java index 8ed3b7c3db5..93b31e95f9c 100644 --- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -56,7 +55,6 @@ import com.cloud.vm.Nic; import com.cloud.vm.NicProfile; import com.cloud.vm.VirtualMachine; -@Local(value = {NetworkModel.class}) public class MockNetworkModelImpl extends ManagerBase implements NetworkModel { @Inject diff --git a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java b/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java index db0ee6c7f17..d2d7c3313e0 100644 --- a/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java +++ b/server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.vpc; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; @@ -34,7 +33,6 @@ import com.cloud.user.ResourceLimitService; import com.cloud.utils.component.ManagerBase; @Component -@Local(value = {ResourceLimitService.class}) public class MockResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService { /* (non-Javadoc) diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java index b59c11a49de..0d6674e5d4f 100644 --- a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java +++ b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java @@ -19,7 +19,6 @@ package com.cloud.vpc; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd; @@ -48,7 +47,6 @@ import com.cloud.utils.component.ManagerBase; import com.cloud.vm.DomainRouterVO; @Component -@Local(value = {Site2SiteVpnManager.class, Site2SiteVpnService.class}) public class MockSite2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpnManager, Site2SiteVpnService { /* (non-Javadoc) diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java b/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java index f13c2d1dd93..95814c228d8 100644 --- a/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java +++ b/server/test/com/cloud/vpc/MockSite2SiteVpnServiceProvider.java @@ -19,7 +19,6 @@ package com.cloud.vpc; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.springframework.stereotype.Component; @@ -30,7 +29,6 @@ import com.cloud.network.element.Site2SiteVpnServiceProvider; import com.cloud.utils.component.ManagerBase; @Component -@Local({Site2SiteVpnServiceProvider.class}) public class MockSite2SiteVpnServiceProvider extends ManagerBase implements Site2SiteVpnServiceProvider { /* (non-Javadoc) diff --git a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java index f6bd9976c2d..a85d039cd13 100644 --- a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java +++ b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java @@ -20,7 +20,6 @@ package com.cloud.vpc; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; @@ -45,7 +44,6 @@ import com.cloud.vm.DomainRouterVO; import com.cloud.vm.VirtualMachineProfile; @Component -@Local(value = {VpcVirtualNetworkApplianceManager.class, VpcVirtualNetworkApplianceService.class}) public class MockVpcVirtualNetworkApplianceManager extends ManagerBase implements VpcVirtualNetworkApplianceManager, VpcVirtualNetworkApplianceService { /* (non-Javadoc) diff --git a/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java b/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java index e8c1f1cfd5f..94f8d659d28 100644 --- a/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockConfigurationDaoImpl.java @@ -19,14 +19,12 @@ package com.cloud.vpc.dao; import java.util.HashMap; import java.util.Map; -import javax.ejb.Local; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; import com.cloud.utils.db.GenericDaoBase; -@Local(value = {ConfigurationDao.class}) public class MockConfigurationDaoImpl extends GenericDaoBase implements ConfigurationDao { /* (non-Javadoc) diff --git a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java index 89f15d58b9c..e80b1cf7933 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; @@ -32,7 +31,6 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; -@Local(value = NetworkDao.class) @DB() public class MockNetworkDaoImpl extends GenericDaoBase implements NetworkDao { diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java index 7ea0a80167d..d77873f014d 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingDaoImpl.java @@ -19,7 +19,6 @@ package com.cloud.vpc.dao; import java.lang.reflect.Field; import java.util.List; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -34,7 +33,6 @@ import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.offerings.dao.NetworkOfferingDaoImpl; import com.cloud.utils.db.DB; -@Local(value = NetworkOfferingDao.class) @DB() public class MockNetworkOfferingDaoImpl extends NetworkOfferingDaoImpl implements NetworkOfferingDao { private static final Logger s_logger = Logger.getLogger(MockNetworkOfferingDaoImpl.class); diff --git a/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java index a37e18642ae..3ad928d0edd 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java @@ -16,14 +16,11 @@ // under the License. package com.cloud.vpc.dao; -import javax.ejb.Local; import com.cloud.network.Network.Service; -import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl; import com.cloud.utils.db.DB; -@Local(value = NetworkOfferingServiceMapDao.class) @DB() public class MockNetworkOfferingServiceMapDaoImpl extends NetworkOfferingServiceMapDaoImpl { diff --git a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java index 9e422f6e1f9..33f9332b28f 100644 --- a/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockNetworkServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.vpc.dao; import java.util.List; -import javax.ejb.Local; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; @@ -27,7 +26,6 @@ import com.cloud.network.dao.NetworkServiceMapVO; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -@Local(value = NetworkServiceMapDao.class) @DB() public class MockNetworkServiceMapDaoImpl extends GenericDaoBase implements NetworkServiceMapDao { diff --git a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java index a436a92a382..f20de036f4c 100644 --- a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java @@ -20,7 +20,6 @@ import java.lang.reflect.Field; import java.util.List; import java.util.Map; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -31,7 +30,6 @@ import com.cloud.network.vpc.dao.VpcDao; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -@Local(value = VpcDao.class) @DB() public class MockVpcDaoImpl extends GenericDaoBase implements VpcDao { private static final Logger s_logger = Logger.getLogger(MockNetworkOfferingDaoImpl.class); diff --git a/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java index 88d3f78e932..9b35ad8a976 100644 --- a/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java @@ -16,14 +16,12 @@ // under the License. package com.cloud.vpc.dao; -import javax.ejb.Local; import com.cloud.network.vpc.VpcOfferingVO; import com.cloud.network.vpc.dao.VpcOfferingDao; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -@Local(value = VpcOfferingDao.class) @DB() public class MockVpcOfferingDaoImpl extends GenericDaoBase implements VpcOfferingDao { diff --git a/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java index 0d3eaa9d015..ba57212e5a0 100644 --- a/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java +++ b/server/test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java @@ -18,7 +18,6 @@ package com.cloud.vpc.dao; import java.util.List; -import javax.ejb.Local; import com.cloud.network.Network.Service; import com.cloud.network.vpc.VpcOfferingServiceMapVO; @@ -26,7 +25,6 @@ import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; -@Local(value = VpcOfferingServiceMapDao.class) @DB() public class MockVpcOfferingServiceMapDaoImpl extends GenericDaoBase implements VpcOfferingServiceMapDao { diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java index bf8b2e4c189..b0dc3839ade 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java +++ b/services/iam/plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -116,7 +115,6 @@ import com.cloud.vm.NicSecondaryIp; import com.cloud.vm.VirtualMachine; import com.cloud.vm.snapshot.VMSnapshot; -@Local(value = {IAMApiService.class}) public class IAMApiServiceImpl extends ManagerBase implements IAMApiService, Manager { public static final Logger s_logger = Logger.getLogger(IAMApiServiceImpl.class); diff --git a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java b/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java index 3a3ba4dd3f2..634ce0a2e02 100644 --- a/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java +++ b/services/iam/plugin/src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -55,7 +54,6 @@ import com.cloud.utils.exception.CloudRuntimeException; //This is the Role Based API access checker that grab's the account's roles //based on the set of roles, access is granted if any of the role has access to the api -@Local(value=APIChecker.class) public class RoleBasedAPIAccessChecker extends AdapterBase implements APIChecker { protected static final Logger s_logger = Logger.getLogger(RoleBasedAPIAccessChecker.class); diff --git a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java index bfeb979c4a0..4ae694b50ff 100644 --- a/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java +++ b/services/iam/server/src/org/apache/cloudstack/iam/server/IAMServiceImpl.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -62,7 +61,6 @@ import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; -@Local(value = {IAMService.class}) public class IAMServiceImpl extends ManagerBase implements IAMService, Manager { public static final Logger s_logger = Logger.getLogger(IAMServiceImpl.class); diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java index 15d58bed012..357c55e5bf1 100644 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java @@ -20,7 +20,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -48,7 +47,6 @@ import com.cloud.vm.SystemVmLoadScanner.AfterScanAction; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.SecondaryStorageVmDao; -@Local(value = {SecondaryStorageVmManager.class}) public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerImpl { private static final Logger s_logger = Logger.getLogger(PremiumSecondaryStorageManagerImpl.class); diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java index 5f8a1e0578b..4891b71967a 100644 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -27,7 +27,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -162,7 +161,6 @@ 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 // -@Local(value = {SecondaryStorageVmManager.class}) public class SecondaryStorageManagerImpl extends ManagerBase implements SecondaryStorageVmManager, VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(SecondaryStorageManagerImpl.class); diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java index ee5064751be..91dcb4cbfa9 100644 --- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java +++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -53,7 +52,6 @@ import com.cloud.utils.script.Script; * storage servers and make sure everything it can do is * correct. */ -@Local(value = Discoverer.class) public class SecondaryStorageDiscoverer extends DiscovererBase implements Discoverer { private static final Logger s_logger = Logger.getLogger(SecondaryStorageDiscoverer.class); diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java index f1706e22966..8c474caa708 100644 --- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java +++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java @@ -38,7 +38,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.storage.command.DownloadCommand; @@ -85,7 +84,6 @@ import com.cloud.utils.script.OutputInterpreter; import com.cloud.utils.script.Script; import com.cloud.utils.storage.QCOW2Utils; -@Local(value = DownloadManager.class) public class DownloadManagerImpl extends ManagerBase implements DownloadManager { private String _name; StorageLayer _storage; diff --git a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java index 3c55f57ede0..fd8c7c0c142 100644 --- a/usage/src/com/cloud/usage/UsageAlertManagerImpl.java +++ b/usage/src/com/cloud/usage/UsageAlertManagerImpl.java @@ -21,7 +21,6 @@ import java.util.Date; import java.util.Map; import java.util.Properties; -import javax.ejb.Local; import javax.inject.Inject; import javax.mail.Authenticator; import javax.mail.Message.RecipientType; @@ -46,7 +45,6 @@ import com.sun.mail.smtp.SMTPSSLTransport; import com.sun.mail.smtp.SMTPTransport; @Component -@Local(value = {AlertManager.class}) public class UsageAlertManagerImpl extends ManagerBase implements AlertManager { private static final Logger s_logger = Logger.getLogger(UsageAlertManagerImpl.class.getName()); private static final Logger s_alertsLogger = Logger.getLogger("org.apache.cloudstack.alerts"); diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java index c1e26b30c0c..ac4aee76cc6 100644 --- a/usage/src/com/cloud/usage/UsageManagerImpl.java +++ b/usage/src/com/cloud/usage/UsageManagerImpl.java @@ -30,7 +30,6 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; @@ -90,7 +89,6 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; @Component -@Local(value = {UsageManager.class}) public class UsageManagerImpl extends ManagerBase implements UsageManager, Runnable { public static final Logger s_logger = Logger.getLogger(UsageManagerImpl.class.getName()); diff --git a/utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java b/utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java index 14eae16e793..ace3b442286 100644 --- a/utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java +++ b/utils/src/main/java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.ejb.Local; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +41,6 @@ import com.cloud.utils.component.AdapterBase; * || seconds | seconds to sleep | integer | 5 || * } **/ -@Local(value = {BackoffAlgorithm.class}) public class ConstantTimeBackoff extends AdapterBase implements BackoffAlgorithm, ConstantTimeBackoffMBean { long _time; private final Map _asleep = new ConcurrentHashMap(); diff --git a/utils/src/main/java/org/apache/cloudstack/utils/identity/ManagementServerNode.java b/utils/src/main/java/org/apache/cloudstack/utils/identity/ManagementServerNode.java index fdd80f7aa65..fcec7df9fb7 100644 --- a/utils/src/main/java/org/apache/cloudstack/utils/identity/ManagementServerNode.java +++ b/utils/src/main/java/org/apache/cloudstack/utils/identity/ManagementServerNode.java @@ -19,7 +19,6 @@ package org.apache.cloudstack.utils.identity; -import javax.ejb.Local; import org.apache.log4j.Logger; @@ -29,7 +28,6 @@ import com.cloud.utils.component.SystemIntegrityChecker; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.MacAddress; -@Local(value = {SystemIntegrityChecker.class}) public class ManagementServerNode extends AdapterBase implements SystemIntegrityChecker { private static final Logger s_logger = Logger.getLogger(ManagementServerNode.class);