You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/23 11:26:52 UTC
[8/9] git commit: updated refs/heads/master to a6b6f41
Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a64c247
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a64c247
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a64c247
Branch: refs/heads/master
Commit: 1a64c247adbeb326f7ddbe6e4feaf3159e9e740d
Parents: 63203ce
Author: cirstofolini <lu...@gmail.com>
Authored: Sat Nov 21 18:31:11 2015 -0200
Committer: cirstofolini <lu...@gmail.com>
Committed: Sat Nov 21 18:31:11 2015 -0200
----------------------------------------------------------------------
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 --
.../src/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 --
.../engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java | 2 --
.../datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java | 2 --
.../engine/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 --
.../schema/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 --
engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 2 --
.../schema/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 --
.../schema/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 --
.../com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java | 2 --
.../cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java | 2 --
.../src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java | 2 --
.../src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java | 2 --
.../cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 2 --
.../com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 2 --
.../src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/as/dao/ConditionDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/as/dao/CounterDaoImpl.java | 2 --
.../src/com/cloud/network/dao/AccountGuestVlanMapDaoImpl.java | 2 --
.../src/com/cloud/network/dao/ExternalFirewallDeviceDaoImpl.java | 2 --
.../com/cloud/network/dao/ExternalLoadBalancerDeviceDaoImpl.java | 2 --
.../src/com/cloud/network/dao/FirewallRulesCidrsDaoImpl.java | 2 --
.../schema/src/com/cloud/network/dao/FirewallRulesDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/dao/IPAddressDaoImpl.java | 2 --
.../com/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 --
engine/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 --
.../schema/src/com/cloud/network/dao/NetworkDetailsDaoImpl.java | 2 --
.../schema/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 --
.../src/com/cloud/network/dao/OpRouterMonitorServiceDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/dao/OvsProviderDaoImpl.java | 2 --
.../schema/src/com/cloud/network/dao/PhysicalNetworkDaoImpl.java | 2 --
.../cloud/network/dao/PhysicalNetworkServiceProviderDaoImpl.java | 2 --
.../com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java | 2 --
.../schema/src/com/cloud/network/dao/RemoteAccessVpnDaoImpl.java | 2 --
.../com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java | 2 --
.../src/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 --
.../schema/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 --
.../src/com/cloud/network/dao/VirtualRouterProviderDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/dao/VpnUserDaoImpl.java | 2 --
.../com/cloud/network/rules/dao/PortForwardingRulesDaoImpl.java | 2 --
.../src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java | 2 --
.../com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java | 2 --
.../cloud/network/security/dao/SecurityGroupRulesDaoImpl.java | 2 --
.../cloud/network/security/dao/SecurityGroupVMMapDaoImpl.java | 2 --
.../com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java | 2 --
.../src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java | 2 --
.../schema/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 --
.../schema/src/com/cloud/network/vpc/dao/PrivateIpDaoImpl.java | 2 --
.../schema/src/com/cloud/network/vpc/dao/StaticRouteDaoImpl.java | 2 --
engine/schema/src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 2 --
.../schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 2 --
.../schema/src/com/cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 2 --
.../com/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 --
.../schema/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 --
.../schema/src/com/cloud/secstorage/CommandExecLogDaoImpl.java | 2 --
.../schema/src/com/cloud/service/dao/ServiceOfferingDaoImpl.java | 2 --
.../src/com/cloud/service/dao/ServiceOfferingDetailsDaoImpl.java | 2 --
engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java | 2 --
.../schema/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 --
.../schema/src/com/cloud/storage/dao/SnapshotPolicyDaoImpl.java | 2 --
.../src/com/cloud/storage/dao/SnapshotScheduleDaoImpl.java | 2 --
.../src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java | 2 --
.../schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java | 2 --
.../schema/src/com/cloud/storage/dao/StoragePoolWorkDaoImpl.java | 2 --
engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java | 2 --
engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 --
.../src/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java | 2 --
.../schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java | 2 --
.../schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java | 2 --
.../schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java | 2 --
engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java | 2 --
.../schema/src/com/cloud/storage/dao/VolumeDetailsDaoImpl.java | 2 --
engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java | 2 --
engine/schema/src/com/cloud/tags/dao/ResourceTagsDaoImpl.java | 2 --
.../schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java | 2 --
engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java | 2 --
.../com/cloud/usage/dao/ExternalPublicIpStatisticsDaoImpl.java | 2 --
engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java | 2 --
engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 2 --
engine/schema/src/com/cloud/usage/dao/UsageJobDaoImpl.java | 2 --
.../src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 2 --
engine/schema/src/com/cloud/usage/dao/UsageNetworkDaoImpl.java | 2 --
.../src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java | 2 --
.../src/com/cloud/usage/dao/UsagePortForwardingRuleDaoImpl.java | 2 --
.../src/com/cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 2 --
engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 --
.../schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java | 2 --
.../schema/src/com/cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 2 --
engine/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 --
engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java | 2 --
engine/schema/src/com/cloud/user/dao/UserStatsLogDaoImpl.java | 2 --
.../schema/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 --
.../schema/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 --
.../schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 2 --
.../schema/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 --
.../schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 2 --
.../org/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 --
.../engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java | 2 --
.../cloudstack/lb/dao/ApplicationLoadBalancerRuleDaoImpl.java | 2 --
.../src/org/apache/cloudstack/region/PortableIpDaoImpl.java | 2 --
.../src/org/apache/cloudstack/region/PortableIpRangeDaoImpl.java | 2 --
.../src/org/apache/cloudstack/region/dao/RegionDaoImpl.java | 2 --
.../apache/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 --
.../resourcedetail/dao/Site2SiteVpnConnectionDetailsDaoImpl.java | 2 --
.../resourcedetail/dao/Site2SiteVpnGatewayDetailsDaoImpl.java | 2 --
.../resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java | 2 --
.../apache/cloudstack/resourcedetail/dao/UserDetailsDaoImpl.java | 2 --
.../resourcedetail/dao/UserIpAddressDetailsDaoImpl.java | 2 --
.../apache/cloudstack/resourcedetail/dao/VpcDetailsDaoImpl.java | 2 --
.../cloudstack/resourcedetail/dao/VpcGatewayDetailsDaoImpl.java | 2 --
.../cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java | 2 --
.../storage/allocator/ClusterScopeStoragePoolAllocator.java | 3 ---
.../storage/allocator/GarbageCollectingStoragePoolAllocator.java | 2 --
.../cloudstack/storage/allocator/LocalStoragePoolAllocator.java | 3 ---
.../cloudstack/storage/allocator/UseLocalForRootAllocator.java | 2 --
.../cloudstack/storage/image/db/ImageStoreDetailsDaoImpl.java | 2 --
.../cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java | 2 --
framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java | 2 --
.../src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java | 2 --
.../com/cloud/cluster/dao/ManagementServerHostPeerDaoImpl.java | 2 --
.../cloudstack/framework/config/dao/ConfigurationDaoImpl.java | 2 --
framework/db/src/com/cloud/dao/EntityManagerImpl.java | 2 --
.../cloudstack/framework/security/keystore/KeystoreDaoImpl.java | 2 --
.../framework/security/keystore/KeystoreManagerImpl.java | 2 --
.../apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java | 2 --
.../apache/cloudstack/affinity/ExplicitDedicationProcessor.java | 2 --
.../apache/cloudstack/affinity/HostAntiAffinityProcessor.java | 2 --
.../org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java | 2 --
.../org/apache/cloudstack/ratelimit/ApiRateLimitServiceImpl.java | 2 --
.../org/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 --
.../src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java | 2 --
.../kafka/src/org/apache/cloudstack/mom/kafka/KafkaEventBus.java | 2 --
.../src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 2 --
.../netapp/src/com/cloud/netapp/NetappManagerImpl.java | 2 --
.../file-systems/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 --
.../com/cloud/agent/manager/allocator/impl/RandomAllocator.java | 2 --
.../src/com/cloud/baremetal/database/BaremetalDhcpDaoImpl.java | 2 --
.../src/com/cloud/baremetal/database/BaremetalPxeDaoImpl.java | 2 --
.../src/com/cloud/baremetal/manager/BareMetalDiscoverer.java | 2 --
.../baremetal/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 --
.../cloud/baremetal/networkservice/BareMetalPingServiceImpl.java | 2 --
.../cloud/baremetal/networkservice/BareMetalResourceBase.java | 2 --
.../com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java | 3 ---
.../com/cloud/baremetal/networkservice/BaremetalDhcpElement.java | 3 ---
.../cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java | 2 --
.../baremetal/networkservice/BaremetalKickStartServiceImpl.java | 2 --
.../com/cloud/baremetal/networkservice/BaremetalPxeElement.java | 2 --
.../cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java | 2 --
.../cloud/baremetal/networkservice/BaremetalUserdataElement.java | 2 --
.../hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java | 2 --
.../hypervisor/hyperv/discoverer/HypervServerDiscoverer.java | 2 --
.../hyperv/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 --
.../hypervisors/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 --
.../java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java | 2 --
.../com/cloud/hypervisor/ovm3/resources/Ovm3FenceBuilder.java | 2 --
.../com/cloud/hypervisor/ovm3/resources/Ovm3HypervisorGuru.java | 2 --
.../src/com/cloud/agent/manager/MockAgentManagerImpl.java | 2 --
.../src/com/cloud/agent/manager/MockStorageManagerImpl.java | 2 --
.../simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java | 2 --
.../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 2 --
.../hypervisors/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 --
.../simulator/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 --
.../simulator/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 --
.../hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java | 2 --
.../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 2 --
.../src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java | 2 --
.../src/com/cloud/hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 2 --
.../com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java | 2 --
.../hypervisor/vmware/dao/VmwareDatacenterZoneMapDaoImpl.java | 2 --
.../com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 2 --
.../src/com/cloud/network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 --
.../src/com/cloud/network/element/CiscoNexusVSMElement.java | 2 --
.../hypervisors/xenserver/src/com/cloud/ha/XenServerFencer.java | 2 --
.../xenserver/src/com/cloud/hypervisor/XenServerGuru.java | 2 --
.../hypervisor/xenserver/discoverer/XcpServerDiscoverer.java | 2 --
.../bigswitch/src/com/cloud/network/dao/BigSwitchBcfDaoImpl.java | 2 --
.../src/com/cloud/network/element/BigSwitchBcfElement.java | 4 ----
.../src/com/cloud/network/guru/BigSwitchBcfGuestNetworkGuru.java | 2 --
.../brocade-vcs/src/com/cloud/network/dao/BrocadeVcsDaoImpl.java | 2 --
.../cloud/network/dao/BrocadeVcsNetworkVlanMappingDaoImpl.java | 2 --
.../src/com/cloud/network/element/BrocadeVcsElement.java | 2 --
.../src/com/cloud/network/guru/BrocadeVcsGuestNetworkGuru.java | 2 --
.../src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java | 2 --
.../cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java | 2 --
.../src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java | 2 --
.../src/com/cloud/network/element/CiscoVnmcElement.java | 2 --
.../src/org/apache/cloudstack/network/element/DnsNotifier.java | 2 --
.../com/cloud/network/element/ElasticLoadBalancerElement.java | 2 --
.../src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java | 2 --
.../src/com/cloud/network/lb/dao/ElasticLbVmMapDaoImpl.java | 2 --
.../com/cloud/network/element/F5ExternalLoadBalancerElement.java | 2 --
.../com/globo/globodns/cloudstack/element/GloboDnsElement.java | 2 --
.../cloudstack/network/element/InternalLoadBalancerElement.java | 3 ---
.../cloudstack/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 --
.../cloud/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 --
.../netscaler/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 --
.../java/com/cloud/network/dao/NiciraNvpNicMappingDaoImpl.java | 2 --
.../com/cloud/network/dao/NiciraNvpRouterMappingDaoImpl.java | 2 --
.../main/java/com/cloud/network/element/NiciraNvpElement.java | 3 ---
.../java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java | 2 --
.../nuage-vsp/src/com/cloud/network/dao/NuageVspDaoImpl.java | 2 --
.../nuage-vsp/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 --
.../src/com/cloud/network/ovs/dao/OvsTunnelInterfaceDaoImpl.java | 2 --
.../src/com/cloud/network/ovs/dao/OvsTunnelNetworkDaoImpl.java | 2 --
.../cloud/network/ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java | 2 --
.../cloud/network/element/PaloAltoExternalFirewallElement.java | 2 --
.../org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java | 2 --
.../src/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 ---
.../org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java | 3 ---
.../vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java | 2 --
.../cloudstack/storage/allocator/RandomStoragePoolAllocator.java | 3 ---
.../org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java | 2 --
.../src/org/apache/cloudstack/ldap/dao/LdapTrustMapDaoImpl.java | 2 --
.../md5/src/com/cloud/server/auth/MD5UserAuthenticator.java | 2 --
.../apache/cloudstack/server/auth/PBKDF2UserAuthenticator.java | 2 --
.../src/com/cloud/server/auth/PlainTextUserAuthenticator.java | 2 --
.../src/org/apache/cloudstack/saml/SAML2AuthManagerImpl.java | 3 ---
.../src/org/apache/cloudstack/saml/SAML2UserAuthenticator.java | 3 ---
.../saml2/src/org/apache/cloudstack/saml/SAMLTokenDaoImpl.java | 2 --
.../src/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 --
.../agent/manager/allocator/impl/FirstFitRoutingAllocator.java | 3 ---
.../agent/manager/allocator/impl/RecreateHostAllocator.java | 3 ---
.../com/cloud/agent/manager/allocator/impl/TestingAllocator.java | 2 --
.../agent/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 --
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java | 2 --
server/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 --
server/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 --
server/src/com/cloud/api/query/dao/DiskOfferingJoinDaoImpl.java | 2 --
server/src/com/cloud/api/query/dao/DomainJoinDaoImpl.java | 2 --
server/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 --
server/src/com/cloud/api/query/dao/InstanceGroupJoinDaoImpl.java | 2 --
.../src/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 --
server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java | 2 --
server/src/com/cloud/api/query/dao/SecurityGroupJoinDaoImpl.java | 2 --
.../src/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java | 2 --
server/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 --
server/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 --
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 --
.../com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java | 2 --
.../consoleproxy/AgentBasedStandaloneConsoleProxyManager.java | 2 --
.../src/com/cloud/consoleproxy/ConsoleProxyBalanceAllocator.java | 2 --
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 --
server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java | 2 --
server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 2 --
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 2 --
server/src/com/cloud/deploy/FirstFitPlanner.java | 2 --
.../src/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 --
server/src/com/cloud/hypervisor/CloudZonesStartupProcessor.java | 2 --
server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java | 2 --
server/src/com/cloud/hypervisor/KVMGuru.java | 2 --
server/src/com/cloud/hypervisor/LXCGuru.java | 2 --
.../com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java | 3 ---
.../com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java | 3 ---
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java | 2 --
server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java | 2 --
server/src/com/cloud/network/ExternalIpAddressAllocator.java | 2 --
.../src/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 --
.../src/com/cloud/network/element/CloudZonesNetworkElement.java | 2 --
server/src/com/cloud/network/element/SecurityGroupElement.java | 2 --
server/src/com/cloud/network/element/VirtualRouterElement.java | 3 ---
.../src/com/cloud/network/element/VpcVirtualRouterElement.java | 4 ----
server/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 --
server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java | 2 --
server/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 --
.../src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java | 2 --
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 2 --
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 3 ---
server/src/com/cloud/network/rules/RulesManagerImpl.java | 2 --
.../src/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 --
server/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 --
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 2 --
server/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 --
server/src/com/cloud/storage/download/DownloadMonitorImpl.java | 2 --
.../storage/secondary/SecondaryStorageVmDefaultAllocator.java | 2 --
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 --
server/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 --
.../org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java | 2 --
.../network/lb/ApplicationLoadBalancerManagerImpl.java | 2 --
server/src/org/apache/cloudstack/region/RegionManagerImpl.java | 2 --
server/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 --
server/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 --
.../com/cloud/vpc/dao/MockNetworkOfferingServiceMapDaoImpl.java | 3 ---
server/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 --
.../test/com/cloud/vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 2 --
.../plugin/src/org/apache/cloudstack/iam/IAMApiServiceImpl.java | 2 --
.../src/org/apache/cloudstack/iam/RoleBasedAPIAccessChecker.java | 2 --
.../src/org/apache/cloudstack/iam/server/IAMServiceImpl.java | 2 --
.../secondarystorage/PremiumSecondaryStorageManagerImpl.java | 2 --
.../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java | 2 --
.../cloudstack/storage/resource/SecondaryStorageDiscoverer.java | 2 --
.../apache/cloudstack/storage/template/DownloadManagerImpl.java | 2 --
usage/src/com/cloud/usage/UsageAlertManagerImpl.java | 2 --
usage/src/com/cloud/usage/UsageManagerImpl.java | 2 --
.../java/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java | 2 --
.../apache/cloudstack/utils/identity/ManagementServerNode.java | 2 --
519 files changed, 1066 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/IsoProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java
index 4d0a331..271818c 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/OVAProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/OVAProcessor.java b/core/src/com/cloud/storage/template/OVAProcessor.java
index e0003b1..31523b6 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/QCOW2Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java
index 096b0b6..642d8d3 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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/RawImageProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/RawImageProcessor.java b/core/src/com/cloud/storage/template/RawImageProcessor.java
index 820ef19..5645a31 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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/TARProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/TARProcessor.java b/core/src/com/cloud/storage/template/TARProcessor.java
index 96c866e..dfd9a0a 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/VhdProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java
index 0b68f89..605d2a3 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index 3d399f5..eacabb9 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index ef8a373..73feeeb 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 04be1ab..f707781 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"));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/engine/orchestration/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
index 254f1bf..c774470 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java
index d7d4720..77c69f3 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index f972539..5c58389 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/DcDetailsDaoImpl.java
----------------------------------------------------------------------
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 b93d8f5..597b55b 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<DcDetailVO, Long> implements DcDetailsDao {
protected final SearchBuilder<DcDetailVO> DcSearch;
protected final SearchBuilder<DcDetailVO> DetailSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java
----------------------------------------------------------------------
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 b21b230..10c75d5 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<EngineClusterVO, Long> implements EngineClusterDao {
private static final Logger s_logger = Logger.getLogger(EngineClusterDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
----------------------------------------------------------------------
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 17833f8..a0d484c 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<EngineDataCenterVO, Long> implements EngineDataCenterDao {
private static final Logger s_logger = Logger.getLogger(EngineDataCenterDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
----------------------------------------------------------------------
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 3a45976..d0d266c 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<EngineHostVO, Long> implements EngineHostDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java
----------------------------------------------------------------------
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 46480ef..1eb0857 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<EngineHostPodVO, Long> implements EngineHostPodDao {
private static final Logger s_logger = Logger.getLogger(EngineHostPodDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostDetailsDaoImpl.java
----------------------------------------------------------------------
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 76f83ea..b954f2d 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<DetailVO, Long> implements HostDetailsDao {
protected final SearchBuilder<DetailVO> HostSearch;
protected final SearchBuilder<DetailVO> DetailSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/HostTagsDaoImpl.java
----------------------------------------------------------------------
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 40e8a99..3381aca 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<HostTagVO, Long> implements HostTagsDao {
protected final SearchBuilder<HostTagVO> HostSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
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 e60e346..87ace2a 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java b/engine/schema/src/com/cloud/alert/dao/AlertDaoImpl.java
index 865b8d1..94d01f4 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<AlertVO, Long> implements AlertDao {
protected final SearchBuilder<AlertVO> AlertSearchByIdsAndType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index cdb69ce..69dc014 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<CapacityVO, Long> implements CapacityDao {
private static final Logger s_logger = Logger.getLogger(CapacityDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java b/engine/schema/src/com/cloud/certificate/dao/CertificateDaoImpl.java
index 978fee0..9544804 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<CertificateVO, Long> implements CertificateDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
----------------------------------------------------------------------
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 483ea45..e1c0dbd 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<HostTransferMapVO, Long> implements HostTransferMapDao {
private static final Logger s_logger = Logger.getLogger(HostTransferMapDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceCountDaoImpl.java
index be429b5..879515a 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<ResourceCountVO, Long> implements ResourceCountDao {
private final SearchBuilder<ResourceCountVO> TypeSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java b/engine/schema/src/com/cloud/configuration/dao/ResourceLimitDaoImpl.java
index 1b033c0..03c2d2a 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<ResourceLimitVO, Long> implements ResourceLimitDao {
private SearchBuilder<ResourceLimitVO> IdTypeSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/ClusterDetailsDaoImpl.java
index c9397c2..a932322 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<ClusterDetailsVO, Long> implements ClusterDetailsDao, ScopedConfigStorage {
protected final SearchBuilder<ClusterDetailsVO> ClusterSearch;
protected final SearchBuilder<ClusterDetailsVO> DetailSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/AccountVlanMapDaoImpl.java
index c9ea999..1211477 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<AccountVlanMapVO, Long> implements AccountVlanMapDao {
protected SearchBuilder<AccountVlanMapVO> AccountSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterDaoImpl.java
index c0f86f3..3459e51 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<ClusterVO, Long> implements ClusterDao {
protected final SearchBuilder<ClusterVO> PodSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java
index 8c0dbe7..12db9f6 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<ClusterVSMMapVO, Long> implements ClusterVSMMapDao {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
index 373446e..847a247 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<DataCenterVO, Long> implements DataCenterDao {
private static final Logger s_logger = Logger.getLogger(DataCenterDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java
index f3b9efe..8bc9eff 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<DataCenterDetailVO> implements DataCenterDetailsDao, ScopedConfigStorage {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java
index 9486650..ae8ae0c 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<DataCenterIpAddressVO, Long> implements DataCenterIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterIpAddressDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterLinkLocalIpAddressDaoImpl.java
index 5917123..4fa3ad7 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<DataCenterLinkLocalIpAddressVO, Long> implements DataCenterLinkLocalIpAddressDao {
private static final Logger s_logger = Logger.getLogger(DataCenterLinkLocalIpAddressDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/HostPodDaoImpl.java
index 1137eb8..8d689e3 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<HostPodVO, Long> implements HostPodDao {
private static final Logger s_logger = Logger.getLogger(HostPodDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java
index ff60d74..cffb7df 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<PodVlanMapVO, Long> implements PodVlanMapDao {
protected SearchBuilder<PodVlanMapVO> PodSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpAddressDaoImpl.java
index 2e7381c..87c4d99 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<StorageNetworkIpAddressVO, Long> implements StorageNetworkIpAddressDao {
protected final GenericSearchBuilder<StorageNetworkIpAddressVO, Long> countInUserIp;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java
index bd49e57..4475f22 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<StorageNetworkIpRangeVO, Long> implements StorageNetworkIpRangeDao {
protected final GenericSearchBuilder<StorageNetworkIpRangeVO, Long> countRanges;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java
index 1003053..165ef21 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<VlanVO, Long> implements VlanDao {
private final String FindZoneWideVlans =
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
index 223172e..4316e3b 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<DomainVO, Long> implements DomainDao {
private static final Logger s_logger = Logger.getLogger(DomainDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/EventDaoImpl.java
index be589e7..d462790 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<EventVO, Long> implements EventDao {
public static final Logger s_logger = Logger.getLogger(EventDaoImpl.class.getName());
protected final SearchBuilder<EventVO> CompletedEventSearch;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
index 1739254..519b2ec 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<UsageEventVO, Long> implements UsageEventDao {
public static final Logger s_logger = Logger.getLogger(UsageEventDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDetailsDaoImpl.java
index 35d77c1..43e00ef 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<UsageEventDetailsVO, Long> implements UsageEventDetailsDao {
public static final Logger s_logger = Logger.getLogger(UsageEventDetailsDaoImpl.class.getName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java b/engine/schema/src/com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java
index 6bddea2..25f8d24 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<HostGpuGroupsVO, Long> implements HostGpuGroupsDao {
private static final Logger s_logger = Logger.getLogger(HostGpuGroupsDaoImpl.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a64c247/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java b/engine/schema/src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java
index 96e3a62..d4e31d3 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<VGPUTypesVO, Long> implements VGPUTypesDao {
private static final Logger s_logger = Logger.getLogger(VGPUTypesDaoImpl.class);