derricks
diff --git a/‎engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java‎
Lines changed: 2 additions & 2 deletions b/‎engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java‎
Lines changed: 1 addition & 2 deletions b/‎plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java‎
Lines changed: 0 additions & 2 deletions b/‎server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎utils/src/com/cloud/utils/component/ComponentContext.java‎
Lines changed: 11 additions & 14 deletions b/‎utils/src/com/cloud/utils/component/ComponentContext.java‎
Lines changed: 11 additions & 14 deletions
@@ -58,7 +58,7 @@ public List<DataStoreProvider> getDataStoreProviders() {
     public boolean configure(String name, Map<String, Object> params)
     		throws ConfigurationException {
 
-
+/*
     	//TODO: hold global lock
         List<DataStoreProviderVO> providerVos = providerDao.listAll();
         for (DataStoreProvider provider : providers) {
@@ -86,7 +86,7 @@ public boolean configure(String name, Map<String, Object> params)
             provider.configure(params);
             providerMap.put(uuid, provider);
         }
-     
+ */    
         return true;
     }
 
 
@@ -206,8 +206,7 @@ protected boolean canHandle(Network network, Service service) {
     public boolean configure(String name, Map<String, Object> params)
             throws ConfigurationException {
         super.configure(name, params);
-        _resourceMgr.registerResourceStateAdapter(this.getClass()
-                .getSimpleName(), this);
+        _resourceMgr.registerResourceStateAdapter(name, this);
         return true;
     }
 
 
@@ -392,6 +392,4 @@ public boolean stop() {
         _resourceMgr.unregisterResourceStateAdapter(this.getClass().getSimpleName());
         return super.stop();
     }
-
-
 }
@@ -18,12 +18,11 @@
 package com.cloud.utils.component;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
@@ -51,24 +50,22 @@
 public class ComponentContext implements ApplicationContextAware {
     private static final Logger s_logger = Logger.getLogger(ComponentContext.class);
 
-    private static ApplicationContext s_appContext;  
+    private static ApplicationContext s_appContext;
 
+	@Inject List<GenericDao> daos;
+    @Inject List<Manager>  mgrs;
+    @Inject List<Adapter>  adapters;
+    
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) {  
-        s_appContext = applicationContext;  
+        s_appContext = applicationContext;
     }  
 
     public static ApplicationContext getApplicationContext() {  
         return s_appContext;  
-    }  
-
-    @PostConstruct
-    public void initComponentsLifeCycle() {
-        @SuppressWarnings("rawtype")
-        Collection<GenericDao> daos = ComponentContext.getApplicationContext().getBeansOfType(GenericDao.class).values();
-        Collection<Manager> mgrs = ComponentContext.getApplicationContext().getBeansOfType(Manager.class).values();
-        Collection<Adapter> adapters = ComponentContext.getApplicationContext().getBeansOfType(Adapter.class).values();
-
+    }
+    
+    public void init() {
         Map<String, Object> params = new HashMap<String, Object>();
         for (GenericDao dao : daos) {
             try {
@@ -80,7 +77,7 @@ public void initComponentsLifeCycle() {
             }
         }
 
-        List<String> avoidMap = new ArrayList<String>();
+       	List<String> avoidMap = new ArrayList<String>();
         for (Manager manager : mgrs) {
             if (avoidMap.contains(manager.getName())) {
                 s_logger.info("Skip manager: " + ComponentContext.getTargetClass(manager).getName() + " as it is already started");
Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,7 @@ protected boolean canHandle(Network network, Service service) {`
`206`	`206`	`public boolean configure(String name, Map<String, Object> params)`
`207`	`207`	`throws ConfigurationException {`
`208`	`208`	`super.configure(name, params);`
`209`		`- _resourceMgr.registerResourceStateAdapter(this.getClass()`
`210`		`- .getSimpleName(), this);`
	`209`	`+ _resourceMgr.registerResourceStateAdapter(name, this);`
`211`	`210`	`return true;`
`212`	`211`	`}`
`213`	`212`
Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,4 @@ public boolean stop() {`
`392`	`392`	`_resourceMgr.unregisterResourceStateAdapter(this.getClass().getSimpleName());`
`393`	`393`	`return super.stop();`
`394`	`394`	`}`
`395`		`-`
`396`		`-`
`397`	`395`	`}`