enterdevstudio
diff --git a/‎agent/src/com/cloud/agent/AgentShell.java‎
Lines changed: 10 additions & 29 deletions b/‎agent/src/com/cloud/agent/AgentShell.java‎
Lines changed: 10 additions & 29 deletions
@@ -53,10 +53,7 @@
 import com.cloud.utils.PropertiesUtil;
 import com.cloud.utils.backoff.BackoffAlgorithm;
 import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
-import com.cloud.utils.component.Adapters;
-import com.cloud.utils.component.LegacyComponentLocator;
 import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.net.MacAddress;
 import com.cloud.utils.script.Script;
 
 public class AgentShell implements IAgentShell {
@@ -146,6 +143,7 @@ public String getGuid() {
         return _guid;
     }
 
+    @Override
     public Map<String, Object> getCmdLineProperties() {
         return _cmdLineProperties;
     }
@@ -378,8 +376,6 @@ protected boolean parseCommand(final String[] args)
 
     public void init(String[] args) throws ConfigurationException {
 
-        final LegacyComponentLocator locator = LegacyComponentLocator.getLocator("agent");
-
         final Class<?> c = this.getClass();
         _version = c.getPackage().getImplementationVersion();
         if (_version == null) {
@@ -396,12 +392,9 @@ public void init(String[] args) throws ConfigurationException {
             s_logger.debug("Found property: " + property);
         }
 
-        _storage = locator.getManager(StorageComponent.class);
-        if (_storage == null) {
-            s_logger.info("Defaulting to using properties file for storage");
-            _storage = new PropertiesStorage();
-            _storage.configure("Storage", new HashMap<String, Object>());
-        }
+        s_logger.info("Defaulting to using properties file for storage");
+        _storage = new PropertiesStorage();
+        _storage.configure("Storage", new HashMap<String, Object>());
 
         // merge with properties from command line to let resource access
         // command line parameters
@@ -410,22 +403,9 @@ public void init(String[] args) throws ConfigurationException {
             _properties.put(cmdLineProp.getKey(), cmdLineProp.getValue());
         }
 
-        final Adapters adapters = locator.getAdapters(BackoffAlgorithm.class);
-        final Enumeration en = adapters.enumeration();
-        while (en.hasMoreElements()) {
-            _backoff = (BackoffAlgorithm) en.nextElement();
-            break;
-        }
-        if (en.hasMoreElements()) {
-            s_logger.info("More than one backoff algorithm specified.  Using the first one ");
-        }
-
-        if (_backoff == null) {
-            s_logger.info("Defaulting to the constant time backoff algorithm");
-            _backoff = new ConstantTimeBackoff();
-            _backoff.configure("ConstantTimeBackoff",
-                    new HashMap<String, Object>());
-        }
+        s_logger.info("Defaulting to the constant time backoff algorithm");
+        _backoff = new ConstantTimeBackoff();
+        _backoff.configure("ConstantTimeBackoff", new HashMap<String, Object>());
     }
 
     private void launchAgent() throws ConfigurationException {
@@ -469,6 +449,7 @@ private void launchConsoleProxy() throws ConfigurationException {
         openPortWithIptables(port);
 
         _consoleProxyMain = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
@@ -522,7 +503,7 @@ private void launchAgentFromClassInfo(String resourceClassNames)
             } catch (final SecurityException e) {
                 throw new ConfigurationException(
                         "Security excetion when loading resource: " + name
-                                + " due to: " + e.toString());
+                        + " due to: " + e.toString());
             } catch (final NoSuchMethodException e) {
                 throw new ConfigurationException(
                         "Method not found excetion when loading resource: "
@@ -534,7 +515,7 @@ private void launchAgentFromClassInfo(String resourceClassNames)
             } catch (final InstantiationException e) {
                 throw new ConfigurationException(
                         "Instantiation excetion when loading resource: " + name
-                                + " due to: " + e.toString());
+                        + " due to: " + e.toString());
             } catch (final IllegalAccessException e) {
                 throw new ConfigurationException(
                         "Illegal access exception when loading resource: "