You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/11/02 02:08:43 UTC
[1/11] git commit: Switch inject annotation to javax and let
ComponentLocator to recognize both the new and original inject annotation
Updated Branches:
refs/heads/asf_javelin_spring d70154609 -> 3afbb0fcc
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3afbb0fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3afbb0fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3afbb0fc
Branch: refs/heads/asf_javelin_spring
Commit: 3afbb0fcc7489247e24ea16e71a16e8e89bff640
Parents: 8724e6e
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Nov 1 18:01:42 2012 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Nov 1 18:01:42 2012 -0700
----------------------------------------------------------------------
.../com/cloud/bridge/service/EC2MainServlet.java | 1 -
client/tomcatconf/applicationContext.xml.in | 3 ++
.../storage/StorageOrchestratorImpl.java | 3 +-
.../cloudstack/storage/image/ImageManagerImpl.java | 3 +-
.../storage/image/ImageOrchestratorImpl.java | 5 ++-
.../storage/image/db/ImageDataDaoImpl.java | 2 +-
.../DefaultPrimaryDataStoreLifeCycle.java | 3 +-
.../manager/PrimaryDataStoreManagerImpl.java | 5 ++-
.../manager/SecondaryStorageManagerImpl.java | 1 -
.../provider/DefaultPrimaryStorageProvider.java | 2 +-
.../storage/strategy/DefaultTemplateStratey.java | 3 +-
.../storage/strategy/DefaultVolumeStrategy.java | 3 +-
.../storage/volume/VolumeManagerImpl.java | 3 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 2 +-
.../manager/allocator/impl/RandomAllocator.java | 1 +
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 2 +-
.../src/com/cloud/ovm/hypervisor/OvmFencer.java | 2 +-
.../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 2 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 2 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 2 +-
.../vmware/manager/VmwareManagerImpl.java | 2 +-
.../network/CiscoNexusVSMDeviceManagerImpl.java | 3 +-
.../network/element/CiscoNexusVSMElement.java | 2 +-
.../xen/src/com/cloud/ha/XenServerFencer.java | 2 +-
.../src/com/cloud/hypervisor/XenServerGuru.java | 2 +-
.../xen/discoverer/XcpServerDiscoverer.java | 2 +-
.../element/ElasticLoadBalancerElement.java | 2 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 2 +-
.../element/F5ExternalLoadBalancerElement.java | 2 +-
.../element/JuniperSRXExternalFirewallElement.java | 2 +-
.../cloud/network/element/NetscalerElement.java | 2 +-
.../cloud/network/element/NiciraNvpElement.java | 2 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 2 +-
.../src/com/cloud/network/element/OvsElement.java | 2 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 2 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 2 +-
server/src/com/cloud/acl/DomainChecker.java | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../src/com/cloud/agent/manager/AgentMonitor.java | 3 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 4 +-
.../manager/allocator/impl/FirstFitAllocator.java | 2 +-
.../allocator/impl/RecreateHostAllocator.java | 2 +-
.../allocator/impl/UserConcentratedAllocator.java | 2 +-
.../manager/authn/impl/BasicAgentAuthManager.java | 2 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 2 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 2 +-
.../com/cloud/baremetal/BareMetalDiscoverer.java | 2 +-
server/src/com/cloud/baremetal/BareMetalGuru.java | 2 +-
.../cloud/baremetal/BareMetalPingServiceImpl.java | 2 +-
.../cloud/baremetal/BareMetalPxeServiceBase.java | 2 +-
.../cloud/baremetal/BareMetalTemplateAdapter.java | 2 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 6 ++-
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 2 +-
.../com/cloud/baremetal/PxeServerManagerImpl.java | 4 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 2 +-
.../cloud/capacity/ComputeCapacityListener.java | 1 -
.../com/cloud/cluster/CheckPointManagerImpl.java | 2 +-
.../com/cloud/cluster/ClusterFenceManagerImpl.java | 2 +-
.../src/com/cloud/cluster/ClusterManagerImpl.java | 2 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 4 +-
.../AgentBasedConsoleProxyManager.java | 2 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 2 +-
.../consoleproxy/StaticConsoleProxyManager.java | 2 +-
server/src/com/cloud/deploy/BareMetalPlanner.java | 2 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 6 ++--
.../src/com/cloud/ha/AbstractInvestigatorImpl.java | 2 +-
.../src/com/cloud/ha/CheckOnAgentInvestigator.java | 2 +-
.../cloud/ha/HighAvailabilityManagerExtImpl.java | 2 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 6 ++--
server/src/com/cloud/ha/KVMFencer.java | 2 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 2 +-
server/src/com/cloud/ha/RecreatableFencer.java | 2 +-
.../src/com/cloud/ha/UserVmDomRInvestigator.java | 2 +-
server/src/com/cloud/ha/XenServerInvestigator.java | 2 +-
.../hypervisor/CloudZonesStartupProcessor.java | 2 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 3 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 2 +-
server/src/com/cloud/hypervisor/KVMGuru.java | 2 +-
.../src/com/cloud/hypervisor/guru/HypervGuru.java | 2 +-
.../hypervisor/hyperv/HypervServerDiscoverer.java | 2 +-
.../kvm/discoverer/KvmServerDiscoverer.java | 2 +-
.../com/cloud/keystore/KeystoreManagerImpl.java | 2 +-
.../cloud/network/ExteralIpAddressAllocator.java | 2 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 2 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 2 +-
.../ExternalLoadBalancerUsageManagerImpl.java | 2 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 6 ++--
.../com/cloud/network/NetworkUsageManagerImpl.java | 2 +-
.../cloud/network/StorageNetworkManagerImpl.java | 2 +-
.../cloud/network/element/BareMetalElement.java | 2 +-
.../network/element/CloudZonesNetworkElement.java | 2 +-
.../cloud/network/element/ExternalDhcpElement.java | 2 +-
.../network/element/VirtualRouterElement.java | 2 +-
.../network/element/VpcVirtualRouterElement.java | 2 +-
.../network/firewall/FirewallManagerImpl.java | 2 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 2 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 2 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 2 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 2 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 2 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 2 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 2 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 2 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 2 +-
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../security/dao/SecurityGroupRuleDaoImpl.java | 2 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 2 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 2 +-
.../src/com/cloud/projects/ProjectManagerImpl.java | 2 +-
server/src/com/cloud/resource/DiscovererBase.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 6 ++--
.../resourcelimit/ResourceLimitManagerImpl.java | 2 +-
.../PremiumSecondaryStorageManagerImpl.java | 2 +-
.../src/com/cloud/server/ManagementServerImpl.java | 2 +-
.../cloud/storage/LocalStoragePoolListener.java | 3 +-
server/src/com/cloud/storage/OCFS2ManagerImpl.java | 2 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 6 ++--
.../allocator/AbstractStoragePoolAllocator.java | 2 +-
.../allocator/FirstFitStoragePoolAllocator.java | 2 +-
.../allocator/LocalStoragePoolAllocator.java | 2 +-
.../allocator/UseLocalForRootAllocator.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 +-
.../cloud/storage/dao/VMTemplateHostDaoImpl.java | 2 +-
.../storage/download/DownloadMonitorImpl.java | 2 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 1 -
.../secondary/SecondaryStorageDiscoverer.java | 2 +-
.../secondary/SecondaryStorageManagerImpl.java | 4 +-
.../storage/snapshot/SnapshotManagerImpl.java | 2 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 2 +-
.../com/cloud/storage/swift/SwiftManagerImpl.java | 2 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 2 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 2 +-
.../cloud/template/HyervisorTemplateAdapter.java | 2 +-
.../com/cloud/template/TemplateAdapterBase.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 7 ++--
server/src/com/cloud/user/AccountManagerImpl.java | 4 +-
server/src/com/cloud/user/DomainManagerImpl.java | 2 +-
.../cloud/uuididentity/IdentityServiceImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 6 ++--
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 7 ----
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +-
.../cloud/utils/component/ComponentLocator.java | 24 +++++++++++++--
152 files changed, 207 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
index 60da11a..e8ccb0c 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
@@ -33,7 +33,6 @@ import com.cloud.bridge.persist.dao.CloudStackConfigurationDao;
import com.cloud.bridge.persist.dao.CloudStackConfigurationDaoImpl;
import com.cloud.bridge.util.ConfigurationHelper;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index 101d43b..0febee3 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -13,6 +13,9 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:annotation-config />
+
+ <!--
<context:component-scan base-package="org.apache.cloudstack, com.cloud" />
+-->
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/StorageOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/StorageOrchestratorImpl.java b/platform/storage/src/org/apache/cloudstack/storage/StorageOrchestratorImpl.java
index 7c88cae..51ba9ff 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/StorageOrchestratorImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/StorageOrchestratorImpl.java
@@ -21,6 +21,8 @@ package org.apache.cloudstack.storage;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataObjectBackupStorageOperationState;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.StorageProvider;
@@ -46,7 +48,6 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.dao.VolumeHostDao;
import com.cloud.template.VirtualMachineTemplate;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/image/ImageManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/image/ImageManagerImpl.java b/platform/storage/src/org/apache/cloudstack/storage/image/ImageManagerImpl.java
index 7c956da..e1a7b55 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/image/ImageManagerImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/image/ImageManagerImpl.java
@@ -20,6 +20,8 @@ package org.apache.cloudstack.storage.image;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.TemplateProfile;
import org.apache.log4j.Logger;
@@ -37,7 +39,6 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VMTemplatePoolDao;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.utils.EnumUtils;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
public class ImageManagerImpl implements ImageManager {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/image/ImageOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/image/ImageOrchestratorImpl.java b/platform/storage/src/org/apache/cloudstack/storage/image/ImageOrchestratorImpl.java
index 43c262d..9a8b399 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/image/ImageOrchestratorImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/image/ImageOrchestratorImpl.java
@@ -20,6 +20,8 @@ package org.apache.cloudstack.storage.image;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.SnapshotProfile;
import org.apache.cloudstack.platform.subsystem.api.storage.TemplateStrategy;
@@ -29,10 +31,9 @@ import org.apache.cloudstack.storage.manager.SecondaryStorageManager;
import com.cloud.storage.TemplateProfile;
import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.storage.dao.VMTemplateZoneDao;
-import com.cloud.utils.component.Inject;
public class ImageOrchestratorImpl implements ImageOrchestrator {
- @Inject
+
SecondaryStorageManager _secStorageMgr;
@Inject
VMTemplateZoneDao _templateZoneDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java b/platform/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
index 8ba5575..27b12fb 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/image/db/ImageDataDaoImpl.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.storage.image.format.ISO;
@@ -59,7 +60,6 @@ import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/lifecycle/DefaultPrimaryDataStoreLifeCycle.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/lifecycle/DefaultPrimaryDataStoreLifeCycle.java b/platform/storage/src/org/apache/cloudstack/storage/lifecycle/DefaultPrimaryDataStoreLifeCycle.java
index dbf8589..3c04c3c 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/lifecycle/DefaultPrimaryDataStoreLifeCycle.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/lifecycle/DefaultPrimaryDataStoreLifeCycle.java
@@ -3,6 +3,8 @@ package org.apache.cloudstack.storage.lifecycle;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStoreDriver;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStoreEndPoint;
@@ -22,7 +24,6 @@ import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.StoragePoolHostDao;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
public class DefaultPrimaryDataStoreLifeCycle implements DataStoreLifeCycle {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/manager/PrimaryDataStoreManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/manager/PrimaryDataStoreManagerImpl.java b/platform/storage/src/org/apache/cloudstack/storage/manager/PrimaryDataStoreManagerImpl.java
index 2cae6a8..0d5d030 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/manager/PrimaryDataStoreManagerImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/manager/PrimaryDataStoreManagerImpl.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore.StoreType;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStoreLifeCycle;
@@ -39,11 +41,10 @@ import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.utils.component.Adapters;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
public class PrimaryDataStoreManagerImpl implements PrimaryDataStoreManager {
- @Inject(adapter = StorageProvider.class)
+ @com.cloud.utils.component.Inject(adapter = StorageProvider.class)
protected Adapters<StorageProvider> _storageProviders;
@Inject
protected DataCenterDao _dcDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/manager/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/manager/SecondaryStorageManagerImpl.java b/platform/storage/src/org/apache/cloudstack/storage/manager/SecondaryStorageManagerImpl.java
index dd4ed68..4343b62 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/manager/SecondaryStorageManagerImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/manager/SecondaryStorageManagerImpl.java
@@ -25,7 +25,6 @@ import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Volume;
import com.cloud.storage.dao.VMTemplateZoneDao;
-import com.cloud.utils.component.Inject;
public class SecondaryStorageManagerImpl implements SecondaryStorageManager {
public DataStore getStore(Volume volume) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java b/platform/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
index a5579d0..e6ae4f3 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
@@ -29,7 +30,6 @@ import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.dao.StoragePoolDao;
-import com.cloud.utils.component.Inject;
public class DefaultPrimaryStorageProvider implements StorageProvider {
private String _name = DefaultPrimaryStorageProvider.class.toString();
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultTemplateStratey.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultTemplateStratey.java b/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultTemplateStratey.java
index 2c6eaa3..6688fda 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultTemplateStratey.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultTemplateStratey.java
@@ -22,6 +22,8 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStoreDriver;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStoreEndPoint;
@@ -43,7 +45,6 @@ import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.dao.VMTemplateHostDao;
import com.cloud.storage.dao.VMTemplatePoolDao;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
public class DefaultTemplateStratey implements TemplateStrategy {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultVolumeStrategy.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultVolumeStrategy.java b/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultVolumeStrategy.java
index 35e284f..b4d0ed7 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultVolumeStrategy.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/strategy/DefaultVolumeStrategy.java
@@ -2,6 +2,8 @@ package org.apache.cloudstack.storage.strategy;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.DataStore;
import org.apache.cloudstack.platform.subsystem.api.storage.DataStoreDriver;
@@ -19,7 +21,6 @@ import org.apache.log4j.Logger;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeVO;
-import com.cloud.utils.component.Inject;
public class DefaultVolumeStrategy implements VolumeStrategy {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java b/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java
index 19e61a8..90c7b66 100644
--- a/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java
+++ b/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeManagerImpl.java
@@ -18,12 +18,13 @@
*/
package org.apache.cloudstack.storage.volume;
+import javax.inject.Inject;
+
import org.apache.cloudstack.platform.subsystem.api.storage.VolumeProfile;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.Volume;
import com.cloud.storage.dao.VolumeDao;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.utils.fsm.StateMachine2;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
index 253e371..f98a15c 100644
--- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
+++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.StringTokenizer;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import netapp.manage.NaAPIFailedException;
@@ -45,7 +46,6 @@ import com.cloud.exception.ResourceInUseException;
import com.cloud.netapp.dao.LunDao;
import com.cloud.netapp.dao.PoolDao;
import com.cloud.netapp.dao.VolumeDao;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
----------------------------------------------------------------------
diff --git a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
index 75a8ff7..79c11d1 100755
--- a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
+++ b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
@@ -24,6 +24,7 @@ import java.util.Map;
import javax.ejb.Local;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.manager.allocator.HostAllocator;
import com.cloud.deploy.DeploymentPlan;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
index 4ad3663..b883cca 100755
--- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
+++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.UUID;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -48,7 +49,6 @@ import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java
index 165bdec..3a47499 100755
--- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java
+++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmFencer.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -35,7 +36,6 @@ import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VMInstanceVO;
import com.cloud.resource.ResourceManager;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java
index eb99f6a..4ded83e 100755
--- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java
+++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java
@@ -17,6 +17,7 @@
package com.cloud.ovm.hypervisor;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
@@ -26,7 +27,6 @@ import com.cloud.hypervisor.HypervisorGuruBase;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.dao.GuestOSDao;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index a0765d8..bf57c09 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -60,7 +61,6 @@ import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.template.VirtualMachineTemplate.BootloaderType;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 6026485..42a29f7 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.UUID;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -66,7 +67,6 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.user.Account;
import com.cloud.utils.UriUtils;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.vmware.vim25.ClusterDasConfigInfo;
import com.vmware.vim25.ManagedObjectReference;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 5549f14..bf5d204 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -86,7 +87,6 @@ import com.cloud.utils.FileUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java
index 05214f5..e5da562 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/network/CiscoNexusVSMDeviceManagerImpl.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
+
import org.apache.log4j.Logger;
import com.cloud.agent.api.StartupCommand;
@@ -41,7 +43,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.vmware.manager.VmwareManager;
import com.cloud.resource.ResourceManager;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
index 990118f..ab3eb34 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -47,7 +48,6 @@ import com.cloud.network.Network.Capability;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.dao.CiscoNexusVSMDeviceDao;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
index fffada6..e70b7cf 100755
--- a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -36,7 +37,6 @@ import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceManager;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VMInstanceVO;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
index a6b86aa..9fc77a9 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
@@ -17,6 +17,7 @@
package com.cloud.hypervisor;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
@@ -27,7 +28,6 @@ import com.cloud.storage.Storage;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.template.VirtualMachineTemplate.BootloaderType;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index d047529..f43e76f 100755
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -27,6 +27,7 @@ import java.util.Queue;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.EntityExistsException;
@@ -85,7 +86,6 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VMTemplateHostDao;
import com.cloud.user.Account;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.db.SearchCriteriaService;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/element/ElasticLoadBalancerElement.java
index e1f7c95..b11389c 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
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -47,7 +48,6 @@ import com.cloud.network.lb.LoadBalancingRule;
import com.cloud.offering.NetworkOffering;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
index cc59b90..f1eb791 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
@@ -30,6 +30,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -115,7 +116,6 @@ import com.cloud.user.UserContext;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
index 9c51296..bcb7c8b 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,6 +23,7 @@ import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -81,7 +82,6 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.resource.ServerResource;
import com.cloud.server.api.response.ExternalLoadBalancerResponse;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
index 4e11007..6ff46c5 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
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -82,7 +83,6 @@ import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.resource.ServerResource;
import com.cloud.server.api.response.ExternalFirewallResponse;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
index d356e9e..5f1b8f2 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
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -97,7 +98,6 @@ import com.cloud.network.rules.StaticNat;
import com.cloud.offering.NetworkOffering;
import com.cloud.resource.ServerResource;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index 231d683..c2971f4 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@ -42,6 +42,7 @@ import java.util.Set;
import java.util.UUID;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -100,7 +101,6 @@ import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
index 00ae1f6..7cc42e9 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java
@@ -38,6 +38,7 @@ import java.net.URISyntaxException;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -73,7 +74,6 @@ import com.cloud.offering.NetworkOffering;
import com.cloud.resource.ResourceManager;
import com.cloud.user.Account;
import com.cloud.user.dao.AccountDao;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java b/plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java
index 6e9a92d..d5a776e 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
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
@@ -37,7 +38,6 @@ import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.ovs.OvsTunnelManager;
import com.cloud.offering.NetworkOffering;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java b/plugins/network-elements/ovs/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
index 413e2f8..418d607 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
@@ -19,6 +19,7 @@ package com.cloud.network.guru;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -39,7 +40,6 @@ import com.cloud.network.ovs.OvsTunnelManager;
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.Nic.ReservationStrategy;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index cc67e20..e4e8eae 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
@@ -23,6 +23,7 @@ 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;
@@ -50,7 +51,6 @@ import com.cloud.network.ovs.dao.OvsTunnelInterfaceDao;
import com.cloud.network.ovs.dao.OvsTunnelInterfaceVO;
import com.cloud.network.ovs.dao.OvsTunnelNetworkDao;
import com.cloud.network.ovs.dao.OvsTunnelNetworkVO;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/acl/DomainChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java
index 7a5baa1..af2798a 100755
--- a/server/src/com/cloud/acl/DomainChecker.java
+++ b/server/src/com/cloud/acl/DomainChecker.java
@@ -17,6 +17,7 @@
package com.cloud.acl;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
@@ -39,7 +40,6 @@ import com.cloud.user.Account;
import com.cloud.user.User;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.Inject;
@Component
@Local(value=SecurityChecker.class)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 30a717f..1ce99fb 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -34,6 +34,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -107,7 +108,6 @@ import com.cloud.utils.ActionDelegate;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/AgentMonitor.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentMonitor.java b/server/src/com/cloud/agent/manager/AgentMonitor.java
index 6eefc08..f89c610 100755
--- a/server/src/com/cloud/agent/manager/AgentMonitor.java
+++ b/server/src/com/cloud/agent/manager/AgentMonitor.java
@@ -21,6 +21,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import javax.inject.Inject;
+
import org.apache.log4j.Logger;
import com.cloud.agent.Listener;
@@ -43,7 +45,6 @@ import com.cloud.host.Status.Event;
import com.cloud.host.dao.HostDao;
import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceState;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.ConnectionConcierge;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria2;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 8d2fabe..08f4fa6 100755
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -38,6 +38,7 @@ 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;
import javax.net.ssl.SSLEngine;
@@ -79,7 +80,6 @@ import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.SearchCriteria2;
@@ -114,7 +114,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
@Inject
protected HostTransferMapDao _hostTransferDao;
- @Inject(adapter = AgentLoadBalancerPlanner.class)
+ @com.cloud.utils.component.Inject(adapter = AgentLoadBalancerPlanner.class)
protected Adapters<AgentLoadBalancerPlanner> _lbPlanners;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
----------------------------------------------------------------------
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 c2ebee9..52b93c4 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -52,7 +53,6 @@ import com.cloud.storage.dao.GuestOSDao;
import com.cloud.user.Account;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.ConsoleProxyDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java
----------------------------------------------------------------------
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 cb09a27..dc2082f 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/RecreateHostAllocator.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -51,7 +52,6 @@ import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
----------------------------------------------------------------------
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 9b03ece..5f7bc09 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
@@ -24,6 +24,7 @@ import java.util.Random;
import java.util.Set;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -49,7 +50,6 @@ import com.cloud.template.VirtualMachineTemplate;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java
----------------------------------------------------------------------
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 aec6df1..74bd621 100644
--- a/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java
+++ b/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java
@@ -19,6 +19,7 @@ package com.cloud.agent.manager.authn.impl;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -32,7 +33,6 @@ import com.cloud.agent.manager.authn.AgentAuthorizer;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.exception.ConnectionException;
import com.cloud.host.dao.HostDao;
-import com.cloud.utils.component.Inject;
@Component
@Local(value={AgentAuthorizer.class, StartupCommandProcessor.class})
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/alert/AlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
index e4ae95d..9fb9a21 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -28,6 +28,7 @@ import java.util.Timer;
import java.util.TimerTask;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.mail.Authenticator;
import javax.mail.Message.RecipientType;
import javax.mail.MessagingException;
@@ -73,7 +74,6 @@ import com.cloud.storage.dao.VolumeDao;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria;
import com.sun.mail.smtp.SMTPMessage;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
index 42ce73a..faf1a90 100644
--- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
+++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
@@ -19,6 +19,7 @@ package com.cloud.alert;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -31,7 +32,6 @@ import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.storage.secondary.SecStorageVmAlertEventArgs;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.events.SubscriptionMgr;
import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.dao.SecondaryStorageVmDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/BareMetalDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalDiscoverer.java b/server/src/com/cloud/baremetal/BareMetalDiscoverer.java
index 3290eb4..a56f378 100755
--- a/server/src/com/cloud/baremetal/BareMetalDiscoverer.java
+++ b/server/src/com/cloud/baremetal/BareMetalDiscoverer.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.UUID;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -49,7 +50,6 @@ import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
import com.cloud.utils.script.Script2;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/BareMetalGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalGuru.java b/server/src/com/cloud/baremetal/BareMetalGuru.java
index f0e6ee6..0ed7719 100755
--- a/server/src/com/cloud/baremetal/BareMetalGuru.java
+++ b/server/src/com/cloud/baremetal/BareMetalGuru.java
@@ -17,6 +17,7 @@
package com.cloud.baremetal;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.springframework.stereotype.Component;
@@ -27,7 +28,6 @@ import com.cloud.hypervisor.HypervisorGuruBase;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.dao.GuestOSDao;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java b/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java
index 23b467a..3ccf298 100755
--- a/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java
+++ b/server/src/com/cloud/baremetal/BareMetalPingServiceImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -40,7 +41,6 @@ import com.cloud.host.HostVO;
import com.cloud.resource.ResourceManager;
import com.cloud.resource.ServerResource;
import com.cloud.uservm.UserVm;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.NicProfile;
import com.cloud.vm.NicVO;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/BareMetalPxeServiceBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalPxeServiceBase.java b/server/src/com/cloud/baremetal/BareMetalPxeServiceBase.java
index 8498c30..62286f9 100644
--- a/server/src/com/cloud/baremetal/BareMetalPxeServiceBase.java
+++ b/server/src/com/cloud/baremetal/BareMetalPxeServiceBase.java
@@ -18,6 +18,7 @@ package com.cloud.baremetal;
import java.util.Map;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.cloud.agent.AgentManager;
@@ -26,7 +27,6 @@ import com.cloud.dc.dao.HostPodDao;
import com.cloud.deploy.DeployDestination;
import com.cloud.host.Host;
import com.cloud.host.dao.HostDao;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
index f11c495..997e873 100755
--- a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
+++ b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
@@ -20,6 +20,7 @@ import java.util.Date;
import java.util.List;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
@@ -43,7 +44,6 @@ import com.cloud.storage.VMTemplateZoneVO;
import com.cloud.template.TemplateAdapter;
import com.cloud.template.TemplateAdapterBase;
import com.cloud.user.Account;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
index c808113..f712791 100755
--- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
+++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
@@ -23,9 +23,11 @@ import java.util.Map;
import java.util.concurrent.Executors;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.StopAnswer;
@@ -81,7 +83,6 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
@@ -102,6 +103,7 @@ import com.cloud.vm.VirtualMachineName;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfile.Param;
+@Component
@Local(value={BareMetalVmManager.class, BareMetalVmService.class})
public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMetalVmManager, BareMetalVmService, Manager,
StateListener<State, VirtualMachine.Event, VirtualMachine> {
@@ -110,7 +112,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
@Inject PxeServerManager _pxeMgr;
@Inject ResourceManager _resourceMgr;
- @Inject (adapter=TemplateAdapter.class)
+ @com.cloud.utils.component.Inject (adapter=TemplateAdapter.class)
protected Adapters<TemplateAdapter> _adapters;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java b/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java
index e85442d..411a7b8 100755
--- a/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java
+++ b/server/src/com/cloud/baremetal/ExternalDhcpManagerImpl.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -49,7 +50,6 @@ import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceStateAdapter;
import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
index 0d992b0..dde1bb4 100755
--- a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
+++ b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -41,7 +42,6 @@ import com.cloud.resource.ServerResource;
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.uservm.UserVm;
import com.cloud.utils.component.Adapters;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
@@ -58,7 +58,7 @@ public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdap
@Inject AgentManager _agentMgr;
@Inject ExternalDhcpManager exDhcpMgr;
@Inject ResourceManager _resourceMgr;
- @Inject(adapter=PxeServerService.class)
+ @com.cloud.utils.component.Inject(adapter=PxeServerService.class)
protected Adapters<PxeServerService> _services;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 4f0ce63..f9bbc1c 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -67,7 +68,6 @@ import com.cloud.storage.swift.SwiftManager;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchCriteria;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/capacity/ComputeCapacityListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/ComputeCapacityListener.java b/server/src/com/cloud/capacity/ComputeCapacityListener.java
index cdeae7e..8ea695a 100755
--- a/server/src/com/cloud/capacity/ComputeCapacityListener.java
+++ b/server/src/com/cloud/capacity/ComputeCapacityListener.java
@@ -31,7 +31,6 @@ import com.cloud.capacity.dao.CapacityDao;
import com.cloud.exception.ConnectionException;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/cluster/CheckPointManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/cluster/CheckPointManagerImpl.java b/server/src/com/cloud/cluster/CheckPointManagerImpl.java
index f6d9de5..78d14d3 100644
--- a/server/src/com/cloud/cluster/CheckPointManagerImpl.java
+++ b/server/src/com/cloud/cluster/CheckPointManagerImpl.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -37,7 +38,6 @@ import com.cloud.serializer.SerializerHelper;
import com.cloud.utils.DateUtil;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java b/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java
index a2ead98..e49b3f7 100644
--- a/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterFenceManagerImpl.java
@@ -20,12 +20,12 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
-import com.cloud.utils.component.Inject;
@Component
@Local(value={ClusterFenceManager.class})
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/cluster/ClusterManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
index 2f057a0..ff7d6b5 100755
--- a/server/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -41,6 +41,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -75,7 +76,6 @@ import com.cloud.utils.Profiler;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.ConnectionConcierge;
import com.cloud.utils.db.DB;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java b/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
index b58a1a8..3bebacd 100755
--- a/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
+++ b/server/src/com/cloud/cluster/agentlb/ClusterBasedAgentLoadBalancerPlanner.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -34,7 +35,6 @@ import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.SearchCriteriaService;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index a5f02df..2a4bb89 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -32,6 +32,7 @@ import java.util.Set;
import java.util.UUID;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -154,7 +155,6 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
@@ -211,7 +211,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
ClusterDao _clusterDao;
@Inject
AlertManager _alertMgr;
- @Inject(adapter = SecurityChecker.class)
+ @com.cloud.utils.component.Inject(adapter = SecurityChecker.class)
Adapters<SecurityChecker> _secChecker;
@Inject
CapacityDao _capacityDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
index a3f996e..aec8883 100755
--- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
@@ -19,6 +19,7 @@ package com.cloud.consoleproxy;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -49,7 +50,6 @@ import com.cloud.info.ConsoleProxyInfo;
import com.cloud.network.Network;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.UserVmVO;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 3113326..0bf2c96 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -28,6 +28,7 @@ import java.util.Random;
import java.util.UUID;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.persistence.Table;
@@ -128,7 +129,6 @@ import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
index a60ae52..295e5c9 100755
--- a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
+++ b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@@ -30,7 +31,6 @@ import com.cloud.host.HostVO;
import com.cloud.info.ConsoleProxyInfo;
import com.cloud.resource.ResourceManager;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.ConsoleProxyDao;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/deploy/BareMetalPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/BareMetalPlanner.java b/server/src/com/cloud/deploy/BareMetalPlanner.java
index 1fded3a..5d0bd76 100755
--- a/server/src/com/cloud/deploy/BareMetalPlanner.java
+++ b/server/src/com/cloud/deploy/BareMetalPlanner.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -43,7 +44,6 @@ import com.cloud.offering.ServiceOffering;
import com.cloud.org.Cluster;
import com.cloud.resource.ResourceManager;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 091f230..ec32e63 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.TreeSet;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -76,7 +77,6 @@ import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.Adapters;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
@@ -106,9 +106,9 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
@Inject protected AccountManager _accountMgr;
@Inject protected StorageManager _storageMgr;
- @Inject(adapter=StoragePoolAllocator.class)
+ @com.cloud.utils.component.Inject(adapter=StoragePoolAllocator.class)
protected Adapters<StoragePoolAllocator> _storagePoolAllocators;
- @Inject(adapter=HostAllocator.class)
+ @com.cloud.utils.component.Inject(adapter=HostAllocator.class)
protected Adapters<HostAllocator> _hostAllocators;
protected String _allocationAlgorithm = "random";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
index 4ed0cd0..a6b9652 100755
--- a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
+++ b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
@@ -36,7 +37,6 @@ import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
import com.cloud.resource.ResourceManager;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.SearchCriteria2;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.SearchCriteriaService;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/ha/CheckOnAgentInvestigator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java
index 55d929e..86662a3 100644
--- a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java
+++ b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java
@@ -17,6 +17,7 @@
package com.cloud.ha;
import javax.ejb.Local;
+import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -29,7 +30,6 @@ import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.component.Inject;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine.State;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3afbb0fc/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
index d7a9105..e8c5005 100644
--- a/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
+import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.springframework.stereotype.Component;
@@ -30,7 +31,6 @@ import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.server.ManagementServer;
import com.cloud.usage.dao.UsageJobDao;
import com.cloud.utils.component.ComponentLocator;
-import com.cloud.utils.component.Inject;
import com.cloud.utils.db.Transaction;
@Component