incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [5/5] git commit: refs/heads/javelin - Improve component lifecycle management with system run-level concept
Date Wed, 30 Jan 2013 23:23:53 GMT
Updated Branches:
  refs/heads/javelin 1e0709d16 -> 176523254


Improve component lifecycle management with system run-level concept


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/17652325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/17652325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/17652325

Branch: refs/heads/javelin
Commit: 176523254e211abef4f0e77278be8af587d7d5ad
Parents: da2e646
Author: Kelven Yang <kelveny@gmail.com>
Authored: Wed Jan 30 15:20:32 2013 -0800
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Wed Jan 30 15:21:02 2013 -0800

----------------------------------------------------------------------
 .../cloud/agent/dao/impl/PropertiesStorage.java    |   30 +++
 .../src/com/cloud/agent/dhcp/FakeDhcpSnooper.java  |   30 +++
 .../com/cloud/agent/resource/DummyResource.java    |   30 +++
 .../consoleproxy/ConsoleProxyResource.java         |    2 +-
 .../com/cloud/bridge/service/EC2MainServlet.java   |    1 -
 .../virtualnetwork/VirtualRoutingResource.java     |   33 +++-
 .../hyperv/resource/HypervDummyResourceBase.java   |   32 +++
 .../hypervisor/hyperv/resource/HypervResource.java |   30 +++
 .../network/resource/TrafficSentinelResource.java  |   30 +++
 core/src/com/cloud/storage/JavaStorageLayer.java   |   30 +++
 .../resource/CifsSecondaryStorageResource.java     |   30 +++
 .../resource/LocalSecondaryStorageResource.java    |   35 +++
 .../resource/NfsSecondaryStorageResource.java      |   30 +++
 .../storage/template/DownloadManagerImpl.java      |    3 +-
 .../com/cloud/storage/template/IsoProcessor.java   |   20 +--
 .../com/cloud/storage/template/QCOW2Processor.java |   23 +--
 .../cloud/storage/template/RawImageProcessor.java  |   20 +--
 .../cloud/storage/template/UploadManagerImpl.java  |   20 +--
 .../com/cloud/storage/template/VhdProcessor.java   |   19 +--
 .../com/cloud/storage/template/VmdkProcessor.java  |   20 +--
 .../storage/test/DirectAgentManagerSimpleImpl.java |    3 +-
 .../provider/DataStoreProviderManagerImpl.java     |   19 +--
 .../src/com/cloud/netapp/NetappManagerImpl.java    |   22 +--
 .../manager/allocator/impl/RandomAllocator.java    |   26 +--
 .../kvm/resource/LibvirtComputingResource.java     |   30 +++
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  |   30 +++
 .../cloud/agent/manager/MockAgentManagerImpl.java  |    3 +-
 .../agent/manager/MockStorageManagerImpl.java      |    3 +-
 .../com/cloud/agent/manager/MockVmManagerImpl.java |    3 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |    3 +-
 .../src/com/cloud/resource/AgentResourceBase.java  |   24 ++
 .../vmware/src/com/cloud/ha/VmwareFencer.java      |   28 +--
 .../vmware/manager/VmwareManagerImpl.java          |   11 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   30 +++
 .../xen/resource/CitrixResourceBase.java           |   21 ++
 .../hypervisor/xen/resource/XcpOssResource.java    |    2 +-
 .../cloudstack/network/element/DnsNotifier.java    |   25 +--
 .../network/lb/ElasticLoadBalancerManagerImpl.java |   22 +--
 .../cloud/network/resource/F5BigIpResource.java    |   30 +++
 .../cloud/network/resource/JuniperSrxResource.java |   32 +++-
 .../cloud/network/resource/NetscalerResource.java  |   30 +++
 .../cloud/network/resource/NiciraNvpResource.java  |   30 +++
 .../cloud/network/ovs/OvsTunnelManagerImpl.java    |   20 +--
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   12 +-
 .../manager/allocator/impl/TestingAllocator.java   |   22 +--
 .../manager/authn/impl/BasicAgentAuthManager.java  |   19 +--
 server/src/com/cloud/alert/AlertManagerImpl.java   |   11 +-
 .../src/com/cloud/alert/ClusterAlertAdapter.java   |   19 +--
 .../com/cloud/alert/ConsoleProxyAlertAdapter.java  |   20 +--
 .../alert/SecondaryStorageVmAlertAdapter.java      |   19 +--
 server/src/com/cloud/api/ApiServlet.java           |   16 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   26 +--
 .../cloud/async/AsyncJobExecutorContextImpl.java   |   28 +--
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |   12 +-
 .../src/com/cloud/async/SyncQueueManagerImpl.java  |   26 +--
 .../cloud/baremetal/BareMetalPxeServiceBase.java   |   26 +--
 .../com/cloud/baremetal/BareMetalResourceBase.java |   30 +++
 .../cloud/baremetal/BareMetalVmManagerImpl.java    |    2 +-
 .../cloud/baremetal/ExternalDhcpManagerImpl.java   |    9 +-
 .../cloud/baremetal/ExternalDhcpResourceBase.java  |   30 +++
 .../com/cloud/baremetal/PxeServerManagerImpl.java  |   10 +-
 .../com/cloud/baremetal/PxeServerResourceBase.java |   30 +++
 .../com/cloud/capacity/CapacityManagerImpl.java    |   10 +-
 .../com/cloud/cluster/ClusterFenceManagerImpl.java |   22 +--
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |   14 +-
 .../cluster/ClusterServiceServletAdapter.java      |   11 +-
 .../com/cloud/cluster/DummyClusterManagerImpl.java |    9 +-
 .../com/cloud/cluster/ManagementServerNode.java    |   24 ++-
 .../ClusterBasedAgentLoadBalancerPlanner.java      |   25 +--
 .../configuration/ConfigurationManagerImpl.java    |   11 +-
 .../configuration/dao/ConfigurationDaoImpl.java    |    2 +
 .../AgentBasedConsoleProxyManager.java             |   16 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   11 +-
 server/src/com/cloud/dao/EntityManagerImpl.java    |    3 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   11 +-
 .../hypervisor/CloudZonesStartupProcessor.java     |   21 +--
 .../hypervisor/HypervisorGuruManagerImpl.java      |   26 +--
 .../kvm/discoverer/KvmDummyResourceBase.java       |   30 +++
 .../com/cloud/keystore/KeystoreManagerImpl.java    |   26 +--
 server/src/com/cloud/maint/UpgradeManagerImpl.java |   20 +--
 .../ExternalLoadBalancerUsageManagerImpl.java      |    9 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |   25 +--
 .../src/com/cloud/network/NetworkManagerImpl.java  |   11 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   11 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   10 +-
 .../com/cloud/network/NetworkUsageManagerImpl.java |   11 +-
 .../cloud/network/StorageNetworkManagerImpl.java   |   28 +--
 .../com/cloud/network/as/AutoScaleManagerImpl.java |   25 +--
 .../network/firewall/FirewallManagerImpl.java      |   19 +--
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   26 +--
 .../router/VirtualNetworkApplianceManagerImpl.java |   10 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   25 +--
 .../network/security/SecurityGroupManagerImpl.java |    3 +-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |   27 +--
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |   11 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   21 +--
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |   20 +--
 .../src/com/cloud/projects/ProjectManagerImpl.java |   12 +-
 .../com/cloud/resource/DummyHostDiscoverer.java    |   25 +--
 .../cloud/resource/DummyHostServerResource.java    |   30 +++
 .../com/cloud/resource/ResourceManagerImpl.java    |   23 +--
 .../resourcelimit/ResourceLimitManagerImpl.java    |   10 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   20 ++-
 server/src/com/cloud/server/ManagementServer.java  |    2 -
 .../com/cloud/server/ManagementServerExtImpl.java  |   19 +-
 .../src/com/cloud/server/ManagementServerImpl.java |  160 ++----------
 .../src/com/cloud/servlet/CloudStartupServlet.java |   44 +---
 server/src/com/cloud/storage/OCFS2ManagerImpl.java |   10 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |    9 +-
 .../storage/download/DownloadMonitorImpl.java      |   10 +-
 .../resource/DummySecondaryStorageResource.java    |   30 +++
 server/src/com/cloud/storage/s3/S3ManagerImpl.java |   13 +-
 .../secondary/SecondaryStorageManagerImpl.java     |   10 +-
 .../SecondaryStorageVmDefaultAllocator.java        |   31 +--
 .../storage/snapshot/SnapshotManagerImpl.java      |   12 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |   10 +-
 .../com/cloud/storage/swift/SwiftManagerImpl.java  |   11 +-
 .../cloud/storage/upload/UploadMonitorImpl.java    |    9 +-
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |   11 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   24 +--
 .../com/cloud/template/TemplateManagerImpl.java    |   10 +-
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |   17 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |   11 +-
 server/src/com/cloud/user/DomainManagerImpl.java   |   26 +--
 .../cloud/uuididentity/IdentityServiceImpl.java    |   28 +--
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    3 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   11 +-
 .../test/com/cloud/agent/MockAgentManagerImpl.java |    3 +-
 .../test/com/cloud/alert/MockAlertManagerImpl.java |    4 +-
 .../com/cloud/network/MockFirewallManagerImpl.java |    5 +-
 .../com/cloud/network/MockNetworkManagerImpl.java  |    3 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |    3 +-
 .../com/cloud/network/MockRulesManagerImpl.java    |    3 +-
 .../vpn/MockRemoteAccessVPNServiceProvider.java    |    3 +-
 .../com/cloud/projects/MockProjectManagerImpl.java |    3 +-
 .../cloud/resource/MockResourceManagerImpl.java    |    3 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |    3 +-
 .../test/com/cloud/user/MockDomainManagerImpl.java |    3 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |    3 +-
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |    3 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    3 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |    3 +-
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |    3 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |    3 +-
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |    3 +-
 .../cloud/vpc/MockSite2SiteVpnServiceProvider.java |    3 +-
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |    3 +-
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |    5 +-
 .../src/com/cloud/usage/UsageAlertManagerImpl.java |   21 +--
 usage/src/com/cloud/usage/UsageManagerImpl.java    |   10 +-
 .../utils/backoff/impl/ConstantTimeBackoff.java    |   10 +-
 utils/src/com/cloud/utils/component/Adapter.java   |   40 +---
 .../src/com/cloud/utils/component/AdapterBase.java |   39 +---
 .../cloud/utils/component/ComponentContext.java    |  202 ++++++---------
 .../cloud/utils/component/ComponentLifecycle.java  |   58 ++++
 .../utils/component/ComponentLifecycleBase.java    |   80 ++++++
 utils/src/com/cloud/utils/component/Manager.java   |   38 +---
 .../src/com/cloud/utils/component/ManagerBase.java |   24 ++
 .../utils/crypt/EncryptionSecretKeyChecker.java    |   19 ++-
 utils/src/com/cloud/utils/db/GenericDaoBase.java   |   23 +--
 160 files changed, 1388 insertions(+), 1751 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
index b94ae83..2bf26f4 100755
--- a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
+++ b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
@@ -127,4 +127,34 @@ public class PropertiesStorage implements StorageComponent {
         return true;
     }
 
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java b/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
index 11ea824..73a994e 100644
--- a/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
+++ b/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
@@ -139,4 +139,34 @@ public class FakeDhcpSnooper implements DhcpSnooper {
         return null;
     }
 
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/agent/src/com/cloud/agent/resource/DummyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java
index 573f639..37a8b3d 100755
--- a/agent/src/com/cloud/agent/resource/DummyResource.java
+++ b/agent/src/com/cloud/agent/resource/DummyResource.java
@@ -224,4 +224,34 @@ public class DummyResource implements ServerResource {
     public void setAgentControl(IAgentControl agentControl) {
         _agentControl = agentControl;
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
index 48f5079..8a3a271 100644
--- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
+++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -77,7 +77,7 @@ import com.google.gson.Gson;
  * server.
  * 
  */
-public class ConsoleProxyResource extends ServerResourceBase implements
+public abstract class ConsoleProxyResource extends ServerResourceBase implements
         ServerResource {
     static final Logger s_logger = Logger.getLogger(ConsoleProxyResource.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 a193291..e064009 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2MainServlet.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.UUID;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 18a0426..6afaaea 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -76,6 +76,7 @@ import com.cloud.exception.InternalErrorException;
 import com.cloud.network.HAProxyConfigurator;
 import com.cloud.network.LoadBalancerConfigurator;
 import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.component.ComponentLifecycle;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.utils.script.OutputInterpreter;
@@ -1152,7 +1153,11 @@ public class VirtualRoutingResource implements Manager {
     public String getName() {
         return _name;
     }
-
+    
+    @Override
+    public void setName(String name) {
+    	_name = name;
+    }
 
 
     @Override
@@ -1160,14 +1165,36 @@ public class VirtualRoutingResource implements Manager {
         return true;
     }
 
-
-
     @Override
     public boolean stop() {
         return true;
     }
 
+    @Override
+    public int getRunLevel() {
+    	return ComponentLifecycle.RUN_LEVEL_COMPONENT;
+    }
+    
+    public void setRunLevel() {
+    }
 
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java b/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
index 6e52924..a66577a 100644
--- a/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
+++ b/core/src/com/cloud/hypervisor/hyperv/resource/HypervDummyResourceBase.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.hypervisor.hyperv.resource;
 
+import java.util.Map;
+
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.PingCommand;
@@ -61,4 +63,34 @@ public class HypervDummyResourceBase extends ServerResourceBase implements
 		return null;
 	}
 
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java b/core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java
index ede6301..0f9b3dd 100755
--- a/core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java
+++ b/core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java
@@ -945,4 +945,34 @@ public class HypervResource extends ServerResourceBase implements ServerResource
         // TODO Auto-generated method stub
         return null;
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/network/resource/TrafficSentinelResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
index 22deccf..7edb67b 100644
--- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java
+++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
@@ -313,4 +313,34 @@ public class TrafficSentinelResource implements ServerResource {
 	       DateFormat dfDate = new SimpleDateFormat("yyyyMMdd HH:mm:ss");
 	       return dfDate.format(date);
 	}
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/JavaStorageLayer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/JavaStorageLayer.java b/core/src/com/cloud/storage/JavaStorageLayer.java
index c4aa74a..525d429 100644
--- a/core/src/com/cloud/storage/JavaStorageLayer.java
+++ b/core/src/com/cloud/storage/JavaStorageLayer.java
@@ -250,6 +250,36 @@ public class JavaStorageLayer implements StorageLayer {
 	     File file = new File(path);
 	     return file.getTotalSpace() - file.getFreeSpace();
 	}
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
     
     
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java
index 0df2a84..285005a 100755
--- a/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java
@@ -722,4 +722,34 @@ public class CifsSecondaryStorageResource extends ServerResourceBase implements
     protected String getDefaultScriptsDir() {
         return "./scripts/storage/secondary";
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java
index b86fe6c..c638c5d 100644
--- a/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java
@@ -208,4 +208,39 @@ public class LocalSecondaryStorageResource extends ServerResourceBase implements
     protected String getDefaultScriptsDir() {
         return "scripts/storage/secondary";
     }
+
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
index a6f8a93..974a2db 100755
--- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
+++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -1808,4 +1808,34 @@ SecondaryStorageResource {
     protected String getDefaultScriptsDir() {
         return "./scripts/storage/secondary";
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/DownloadManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/DownloadManagerImpl.java b/core/src/com/cloud/storage/template/DownloadManagerImpl.java
index d5ed71e..22e78a0 100755
--- a/core/src/com/cloud/storage/template/DownloadManagerImpl.java
+++ b/core/src/com/cloud/storage/template/DownloadManagerImpl.java
@@ -59,12 +59,13 @@ import com.cloud.storage.template.Processor.FormatInfo;
 import com.cloud.storage.template.TemplateDownloader.DownloadCompleteCallback;
 import com.cloud.storage.template.TemplateDownloader.Status;
 import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.OutputInterpreter;
 import com.cloud.utils.script.Script;
 
 @Local(value = DownloadManager.class)
-public class DownloadManagerImpl implements DownloadManager {
+public class DownloadManagerImpl extends ManagerBase implements DownloadManager {
     private String _name;
     StorageLayer _storage;
     Map<String, Processor> _processors;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/IsoProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/IsoProcessor.java b/core/src/com/cloud/storage/template/IsoProcessor.java
index 112002a..c8cde65 100644
--- a/core/src/com/cloud/storage/template/IsoProcessor.java
+++ b/core/src/com/cloud/storage/template/IsoProcessor.java
@@ -26,12 +26,12 @@ import org.apache.log4j.Logger;
 
 import com.cloud.storage.StorageLayer;
 import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.utils.component.AdapterBase;
 
 @Local(value=Processor.class)
-public class IsoProcessor implements Processor {
+public class IsoProcessor extends AdapterBase implements Processor {
     private static final Logger s_logger = Logger.getLogger(IsoProcessor.class);
     
-    String _name;
     StorageLayer _storage;
 
     @Override
@@ -59,26 +59,10 @@ public class IsoProcessor implements Processor {
 
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        _name = name;
         _storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
         if (_storage == null) {
             throw new ConfigurationException("Unable to get storage implementation");
         }
         return true;
     }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/QCOW2Processor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/QCOW2Processor.java b/core/src/com/cloud/storage/template/QCOW2Processor.java
index 15af849..09dcfe2 100644
--- a/core/src/com/cloud/storage/template/QCOW2Processor.java
+++ b/core/src/com/cloud/storage/template/QCOW2Processor.java
@@ -29,11 +29,11 @@ import org.apache.log4j.Logger;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.StorageLayer;
 import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.component.AdapterBase;
 
 @Local(value=Processor.class)
-public class QCOW2Processor implements Processor {
+public class QCOW2Processor extends AdapterBase implements Processor {
     private static final Logger s_logger = Logger.getLogger(QCOW2Processor.class);
-    String _name;
     StorageLayer _storage;
 
 	@Override
@@ -85,7 +85,6 @@ public class QCOW2Processor implements Processor {
 	@Override
 	public boolean configure(String name, Map<String, Object> params)
 			throws ConfigurationException {
-		  _name = name;
 	        _storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
 	        if (_storage == null) {
 	            throw new ConfigurationException("Unable to get storage implementation");
@@ -93,22 +92,4 @@ public class QCOW2Processor implements Processor {
 	        
 	        return true;
 	}
-
-	@Override
-	public String getName() {
-		 return _name;
-	}
-
-	@Override
-	public boolean start() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	public boolean stop() {
-		// TODO Auto-generated method stub
-		return true;
-	}
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/RawImageProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/RawImageProcessor.java b/core/src/com/cloud/storage/template/RawImageProcessor.java
index 694c76a..7833eab 100644
--- a/core/src/com/cloud/storage/template/RawImageProcessor.java
+++ b/core/src/com/cloud/storage/template/RawImageProcessor.java
@@ -28,17 +28,16 @@ import com.cloud.exception.InternalErrorException;
 import com.cloud.storage.StorageLayer;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.template.Processor.FormatInfo;
+import com.cloud.utils.component.AdapterBase;
 
 @Local(value=Processor.class)
-public class RawImageProcessor implements Processor {
+public class RawImageProcessor extends AdapterBase implements Processor {
     private static final Logger s_logger = Logger.getLogger(RawImageProcessor.class);
-    String _name;
     StorageLayer _storage;
     
 	@Override
 	public boolean configure(String name, Map<String, Object> params)
 			throws ConfigurationException {
-        _name = name;
         _storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
         if (_storage == null) {
             throw new ConfigurationException("Unable to get storage implementation");
@@ -48,21 +47,6 @@ public class RawImageProcessor implements Processor {
 	}
 
 	@Override
-	public String getName() {
-		return _name;
-	}
-
-	@Override
-	public boolean start() {
-		return true;
-	}
-
-	@Override
-	public boolean stop() {
-		return true;
-	}
-
-	@Override
 	public FormatInfo process(String templatePath, ImageFormat format,
 			String templateName) throws InternalErrorException {
 		if (format != null) {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/UploadManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/UploadManagerImpl.java b/core/src/com/cloud/storage/template/UploadManagerImpl.java
index 0de1c6c..2492a1b 100755
--- a/core/src/com/cloud/storage/template/UploadManagerImpl.java
+++ b/core/src/com/cloud/storage/template/UploadManagerImpl.java
@@ -47,10 +47,11 @@ import com.cloud.storage.resource.SecondaryStorageResource;
 import com.cloud.storage.template.TemplateUploader.Status;
 import com.cloud.storage.template.TemplateUploader.UploadCompleteCallback;
 import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
 
-public class UploadManagerImpl implements UploadManager {
+public class UploadManagerImpl extends ManagerBase implements UploadManager {
 
 
     public class Completion implements UploadCompleteCallback {
@@ -176,7 +177,6 @@ public class UploadManagerImpl implements UploadManager {
     private StorageLayer _storage;
     private int installTimeoutPerGig;
     private boolean _sslCopy;
-    private String _name;
     private boolean hvm;
 
 
@@ -442,7 +442,6 @@ public class UploadManagerImpl implements UploadManager {
     @Override
     public boolean configure(String name, Map<String, Object> params)
             throws ConfigurationException {
-        _name = name;
 
         String value = null;
 
@@ -525,21 +524,6 @@ public class UploadManagerImpl implements UploadManager {
 
     }
 
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
     /**
      * Get notified of change of job status. Executed in context of uploader thread
      * 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/VhdProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VhdProcessor.java b/core/src/com/cloud/storage/template/VhdProcessor.java
index b65b1dc..cabc74b 100644
--- a/core/src/com/cloud/storage/template/VhdProcessor.java
+++ b/core/src/com/cloud/storage/template/VhdProcessor.java
@@ -31,6 +31,7 @@ import com.cloud.exception.InternalErrorException;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.StorageLayer;
 import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.component.AdapterBase;
 
 /**
  * VhdProcessor processes the downloaded template for VHD.  It
@@ -39,10 +40,9 @@ import com.cloud.utils.NumbersUtil;
  *
  */
 @Local(value=Processor.class)
-public class VhdProcessor implements Processor {
+public class VhdProcessor extends AdapterBase implements Processor {
     
     private static final Logger s_logger = Logger.getLogger(VhdProcessor.class);
-    String _name;
     StorageLayer _storage;
     private int vhd_footer_size = 512;
     private int vhd_footer_creator_app_offset = 28;
@@ -110,21 +110,6 @@ public class VhdProcessor implements Processor {
         
         return true;
     }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
     
     private void imageSignatureCheck(byte[] creatorApp) throws InternalErrorException {
     	boolean findKnownCreator = false;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index ec7f014..e074041 100644
--- a/core/src/com/cloud/storage/template/VmdkProcessor.java
+++ b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -32,13 +32,13 @@ import org.apache.log4j.Logger;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.StorageLayer;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.script.Script;
 
 @Local(value=Processor.class)
-public class VmdkProcessor implements Processor {
+public class VmdkProcessor extends AdapterBase implements Processor {
     private static final Logger s_logger = Logger.getLogger(VmdkProcessor.class);
 
-    String _name;
     StorageLayer _storage;
 	
     @Override
@@ -137,7 +137,6 @@ public class VmdkProcessor implements Processor {
 
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        _name = name;
         _storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);
         if (_storage == null) {
             throw new ConfigurationException("Unable to get storage implementation");
@@ -145,19 +144,4 @@ public class VmdkProcessor implements Processor {
     	
     	return true;
     }
-    
-    @Override
-    public String getName() {
-        return _name;
-    }
-    
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
index 6d09561..81db645 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
@@ -45,8 +45,9 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.xen.resource.XcpOssResource;
 import com.cloud.resource.ServerResource;
+import com.cloud.utils.component.ManagerBase;
 
-public class DirectAgentManagerSimpleImpl implements AgentManager {
+public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentManager {
     private static final Logger logger = Logger.getLogger(DirectAgentManagerSimpleImpl.class);
     private Map<Long, ServerResource> hostResourcesMap = new HashMap<Long, ServerResource>();
     @Inject

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
index 1ced37a..3634b52 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
@@ -30,8 +30,10 @@ import org.apache.cloudstack.storage.datastore.db.DataStoreProviderDao;
 import org.apache.cloudstack.storage.datastore.db.DataStoreProviderVO;
 import org.springframework.stereotype.Component;
 
+import com.cloud.utils.component.ManagerBase;
+
 @Component
-public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
+public class DataStoreProviderManagerImpl extends ManagerBase implements DataStoreProviderManager {
     @Inject
     List<DataStoreProvider> providers;
     @Inject
@@ -91,21 +93,6 @@ public class DataStoreProviderManagerImpl implements DataStoreProviderManager {
     }
 
     @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return "Data store provider manager";
-    }
-
-    @Override
     public DataStoreProvider getDataStoreProviderById(long id) {
         DataStoreProviderVO provider = providerDao.findById(id);
         return providerMap.get(provider.getUuid());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 7fe22dd..90bb9b2 100644
--- a/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
+++ b/plugins/file-systems/netapp/src/com/cloud/netapp/NetappManagerImpl.java
@@ -46,18 +46,17 @@ 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.ManagerBase;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 @Component
 @Local(value = { NetappManager.class })
-public class NetappManagerImpl implements NetappManager
+public class NetappManagerImpl extends ManagerBase implements NetappManager
 {   
 	public enum Algorithm { roundrobin,leastfull }
 
-    protected String _name;
-    
     public static final Logger s_logger = Logger.getLogger(NetappManagerImpl.class.getName());
     @Inject public VolumeDao _volumeDao;
     @Inject public PoolDao _poolDao;
@@ -1017,26 +1016,9 @@ public class NetappManagerImpl implements NetappManager
 	public boolean configure(String name, Map<String, Object> params)
 			throws ConfigurationException {
 
-       _name = name;
        
        _netappAllocator = new NetappDefaultAllocatorImpl( this );
 
 		return true;
 	}
-
-	@Override
-	public String getName() {
-		return _name;
-	}
-
-	@Override
-	public boolean start() {
-		return true;
-	}
-
-	@Override
-	public boolean stop() {
-		return true;
-	}
-	
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 c302cdd..a672efd 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
@@ -36,14 +36,14 @@ import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.resource.ResourceManager;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 
 @Component
 @Local(value=HostAllocator.class)
-public class RandomAllocator implements HostAllocator {
+public class RandomAllocator extends AdapterBase implements HostAllocator {
     private static final Logger s_logger = Logger.getLogger(RandomAllocator.class);
-    private String _name;
     @Inject private HostDao _hostDao;
     @Inject private ResourceManager _resourceMgr;
 
@@ -116,26 +116,4 @@ public class RandomAllocator implements HostAllocator {
         // return true
         return true;
     }
-
-    @Override
-    public boolean configure(String name, Map<String, Object> params) {
-        _name=name;
-
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index b6d8050..c93e37a 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -4624,4 +4624,34 @@ ServerResource {
         return new Answer(cmd, success, "");
     }
 
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
index c5cb586..a626e31 100755
--- a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
+++ b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java
@@ -1382,4 +1382,34 @@ public class OvmResourceBase implements ServerResource, HypervisorResource {
 
 	}
 
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
index 0a9f93f..2178651 100755
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
@@ -56,6 +56,7 @@ import com.cloud.simulator.MockVMVO;
 import com.cloud.simulator.dao.MockHostDao;
 import com.cloud.simulator.dao.MockVMDao;
 import com.cloud.utils.Pair;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
@@ -63,7 +64,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
 
 @Local(value = { MockAgentManager.class })
-public class MockAgentManagerImpl implements MockAgentManager {
+public class MockAgentManagerImpl extends ManagerBase implements MockAgentManager {
     private static final Logger s_logger = Logger.getLogger(MockAgentManagerImpl.class);
     @Inject
     HostPodDao _podDao = null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
index 3c371bc..f445bb3 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java
@@ -92,13 +92,14 @@ import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.VMTemplateStorageResourceAssoc;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.storage.template.TemplateInfo;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.DiskProfile;
 import com.cloud.vm.VirtualMachine.State;
 
 @Local(value = { MockStorageManager.class })
-public class MockStorageManagerImpl implements MockStorageManager {
+public class MockStorageManagerImpl extends ManagerBase implements MockStorageManager {
     private static final Logger s_logger = Logger.getLogger(MockStorageManagerImpl.class);
     @Inject
     MockStoragePoolDao _mockStoragePoolDao = null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
index 63c04be..60e1a61 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -82,12 +82,13 @@ import com.cloud.simulator.dao.MockSecurityRulesDao;
 import com.cloud.simulator.dao.MockVMDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine.State;
 
 @Local(value = { MockVmManager.class })
-public class MockVmManagerImpl implements MockVmManager {
+public class MockVmManagerImpl extends ManagerBase implements MockVmManager {
     private static final Logger s_logger = Logger.getLogger(MockVmManagerImpl.class);
 
     @Inject MockVMDao _mockVmDao = null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index b0bc703..4144357 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -89,6 +89,7 @@ import com.cloud.simulator.MockVMVO;
 import com.cloud.simulator.dao.MockConfigurationDao;
 import com.cloud.simulator.dao.MockHostDao;
 import com.cloud.utils.Pair;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.ConnectionConcierge;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
@@ -96,7 +97,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine.State;
 
 @Local(value = { SimulatorManager.class })
-public class SimulatorManagerImpl implements SimulatorManager {
+public class SimulatorManagerImpl extends ManagerBase implements SimulatorManager {
     private static final Logger s_logger = Logger.getLogger(SimulatorManagerImpl.class);
     @Inject
     MockVmManager _mockVmMgr = null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
index 82989fd..27f158c 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentResourceBase.java
@@ -282,4 +282,28 @@ public class AgentResourceBase implements ServerResource {
     public boolean isStopped() {
         return this.stopped;
     }
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
index b7f244a..2ed5caf 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
@@ -22,11 +22,11 @@ import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
 import com.cloud.host.HostVO;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VMInstanceVO;
 
 @Local(value=FenceBuilder.class)
-public class VmwareFencer implements FenceBuilder {
-    String _name;
+public class VmwareFencer extends AdapterBase implements FenceBuilder {
 
     @Override
     public Boolean fenceOff(VMInstanceVO vm, HostVO host) {
@@ -36,28 +36,4 @@ public class VmwareFencer implements FenceBuilder {
     public VmwareFencer() {
         super();
     }
-
-    @Override
-    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-    
-    public void setName(String name) {
-    	_name = name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 16fd3d7..7939620 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
@@ -81,6 +81,7 @@ import com.cloud.utils.FileUtil;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GlobalLock;
@@ -94,7 +95,7 @@ import com.vmware.vim25.HostConnectSpec;
 import com.vmware.vim25.ManagedObjectReference;
 
 @Local(value = {VmwareManager.class})
-public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Listener, Manager {
+public class VmwareManagerImpl extends ManagerBase implements VmwareManager, VmwareStorageMount, Listener {
     private static final Logger s_logger = Logger.getLogger(VmwareManagerImpl.class);
 
     private static final int STARTUP_DELAY = 60000; 				// 60 seconds
@@ -103,7 +104,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
     private long _hostScanInterval = DEFAULT_HOST_SCAN_INTERVAL;
     int _timeout;
 
-    private String _name;
     private String _instance;
 
     @Inject AgentManager _agentMgr;
@@ -164,8 +164,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         s_logger.info("Configure VmwareManagerImpl, manager name: " + name);
 
-        _name = name;
-
         if(!_configDao.isPremium()) {
             s_logger.error("Vmware component can only run under premium distribution");
             throw new ConfigurationException("Vmware component can only run under premium distribution");
@@ -322,11 +320,6 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
     }
 
     @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
     public boolean getNexusVSwitchGlobalParameter() {
         return _nexusVSwitchActive;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index b10689f..0615a0a 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -4880,4 +4880,34 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
         // TODO: Fix this? cmd.setContextParam("checkpoint", String.valueOf(checkPointId));
         return vmName;
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index f224d7d..7e763e2 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7719,4 +7719,25 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         }
     }
 
+	@Override
+	public void setName(String name) {
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
index 0a10647..357b433 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
@@ -20,6 +20,7 @@ package com.cloud.hypervisor.xen.resource;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.ejb.Local;
@@ -166,5 +167,4 @@ public class XcpOssResource extends CitrixResourceBase {
     	}
     	return answer;
     }
-    
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java
index f9aa063..907e8e7 100644
--- a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java
+++ b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java
@@ -35,6 +35,7 @@ import com.cloud.network.Network.Service;
 import com.cloud.network.PhysicalNetworkServiceProvider;
 import com.cloud.network.element.NetworkElement;
 import com.cloud.offering.NetworkOffering;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VirtualMachine;
@@ -45,35 +46,13 @@ import com.cloud.vm.VirtualMachineProfile;
  *
  */
 @Local(NetworkElement.class)
-public class DnsNotifier implements NetworkElement {
-    String _name = null;
+public class DnsNotifier extends AdapterBase implements NetworkElement {
 
     public DnsNotifier() {
 
     }
 
     @Override
-    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        _name = name;
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
-    @Override
     public Map<Service, Map<Capability, String>> getCapabilities() {
         Map<Service, Map<Capability, String>> caps = new HashMap<Service, Map<Capability, String>>(); 
         caps.put(Service.Dns, new HashMap<Capability, String>());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 c84150b..81039d1 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
@@ -118,6 +118,7 @@ import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.SearchBuilder;
@@ -140,8 +141,8 @@ import com.cloud.vm.dao.NicDao;
 
 @Component
 @Local(value = { ElasticLoadBalancerManager.class })
-public class ElasticLoadBalancerManagerImpl implements
-ElasticLoadBalancerManager, Manager,  VirtualMachineGuru<DomainRouterVO> {
+public class ElasticLoadBalancerManagerImpl extends ManagerBase implements
+ElasticLoadBalancerManager, VirtualMachineGuru<DomainRouterVO> {
     private static final Logger s_logger = Logger
             .getLogger(ElasticLoadBalancerManagerImpl.class);
     
@@ -200,7 +201,6 @@ ElasticLoadBalancerManager, Manager,  VirtualMachineGuru<DomainRouterVO> {
     @Inject
     NicDao _nicDao;
 
-    String _name;
     String _instance;
     static final private String _elbVmNamePrefix = "l";
     static final private String _systemVmType = "elbvm";
@@ -390,7 +390,6 @@ ElasticLoadBalancerManager, Manager,  VirtualMachineGuru<DomainRouterVO> {
     @Override
     public boolean configure(String name, Map<String, Object> params)
             throws ConfigurationException {
-        _name = name;
         final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
         _systemAcct = _accountService.getSystemAccount();
         _instance = configs.get("instance.name");
@@ -435,21 +434,6 @@ ElasticLoadBalancerManager, Manager,  VirtualMachineGuru<DomainRouterVO> {
         return true;
     }
 
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
     private DomainRouterVO findELBVmWithCapacity(Network guestNetwork, IPAddressVO ipAddr) {
         List<DomainRouterVO> unusedElbVms = _elbVmMapDao.listUnusedElbVms();
         if (unusedElbVms.size() > 0) {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
index 80a7a85..1733712 100644
--- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
+++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
@@ -1066,6 +1066,36 @@ public class F5BigIpResource implements ServerResource {
 	
 	private static String[] genStringArray(String s) {
 		return new String[]{s};
+	}
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
 	}				
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index 11ff296..8482168 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -3420,6 +3420,36 @@ public class JuniperSrxResource implements ServerResource {
         } else {
             return doc;
         }
-    }    
+    }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}    
     
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index ca8c8a7..abea464 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -2342,4 +2342,34 @@ public class NetscalerResource implements ServerResource {
     public void disconnected() {
         return;
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
index 027f451..6a9a006 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
@@ -794,5 +794,35 @@ public class NiciraNvpResource implements ServerResource {
 		return rulepair;
    	
     }
+
+	@Override
+	public void setName(String name) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setConfigParams(Map<String, Object> params) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<String, Object> getConfigParams() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int getRunLevel() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setRunLevel(int level) {
+		// TODO Auto-generated method stub
+		
+	}
     
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 e4e8eae..b1ecaac 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
@@ -51,6 +51,7 @@ 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.ManagerBase;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -66,11 +67,10 @@ import com.cloud.vm.dao.UserVmDao;
 
 @Component
 @Local(value={OvsTunnelManager.class})
-public class OvsTunnelManagerImpl implements OvsTunnelManager {
+public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager {
 	public static final Logger s_logger = 
 			Logger.getLogger(OvsTunnelManagerImpl.class.getName());
 	
-	String _name;
 	boolean _isEnabled;
 	ScheduledExecutorService _executorPool;
     ScheduledExecutorService _cleanupExecutor;
@@ -88,7 +88,6 @@ public class OvsTunnelManagerImpl implements OvsTunnelManager {
 	@Override
 	public boolean configure(String name, Map<String, Object> params)
 			throws ConfigurationException {
-		_name = name;
 		_isEnabled = Boolean.parseBoolean(_configDao.getValue(Config.OvsTunnelNetwork.key()));
 		
 		if (_isEnabled) {
@@ -378,21 +377,6 @@ public class OvsTunnelManagerImpl implements OvsTunnelManager {
 	}
 	
 	@Override
-	public boolean start() {
-		return true;
-	}
-
-	@Override
-	public boolean stop() {
-		return true;
-	}
-
-	@Override
-	public String getName() {
-		return _name;
-	}
-
-	@Override
 	public boolean isOvsTunnelEnabled() {
 		return _isEnabled;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 364f8fb..2286dab 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -110,6 +110,7 @@ import com.cloud.utils.ActionDelegate;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.Transaction;
@@ -141,7 +142,7 @@ import edu.emory.mathcs.backport.java.util.Collections;
  *         report router statistics | seconds | 300s || * }
  **/
 @Local(value = { AgentManager.class })
-public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
+public class AgentManagerImpl extends ManagerBase implements AgentManager, HandlerFactory {
     private static final Logger s_logger = Logger.getLogger(AgentManagerImpl.class);
     private static final Logger status_logger = Logger.getLogger(Status.class);
 
@@ -206,7 +207,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
 
     protected int _retry = 2;
 
-    protected String _name;
     protected String _instance;
 
     protected int _wait;
@@ -230,8 +230,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
 
     @Override
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
-        _name = name;
-
+ 
         final Map<String, String> configs = _configDao.getConfiguration("AgentManager", params);
         _port = NumbersUtil.parseInt(configs.get("port"), 8250);
         final int workers = NumbersUtil.parseInt(configs.get("workers"), 5);
@@ -840,11 +839,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
         return true;
     }
 
-    @Override
-    public String getName() {
-        return _name;
-    }
-
     protected boolean handleDisconnectWithoutInvestigation(AgentAttache attache, Status.Event event, boolean transitState) {
         long hostId = attache.getId();
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java
index c8bbe02..90bd956 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java
@@ -32,17 +32,17 @@ import com.cloud.host.Host;
 import com.cloud.host.Host.Type;
 import com.cloud.host.dao.HostDao;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 
 @Component
 @Local(value={HostAllocator.class})
-public class TestingAllocator implements HostAllocator {
+public class TestingAllocator extends AdapterBase implements HostAllocator {
     @Inject HostDao _hostDao;
     Long _computingHost;
     Long _storageHost;
     Long _routingHost;
-    String _name;
 
     @Override
     public List<Host> allocateTo(VirtualMachineProfile<? extends VirtualMachine> vmProfile, DeploymentPlan plan, Type type,
@@ -81,24 +81,6 @@ public class TestingAllocator implements HostAllocator {
         value = (String)params.get(Host.Type.Storage.toString());
         _storageHost = (value != null) ? Long.parseLong(value) : null;
 
-        _name = name;
-
         return true;
     }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 74bd621..cd4ec8d 100644
--- a/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java
+++ b/server/src/com/cloud/agent/manager/authn/impl/BasicAgentAuthManager.java
@@ -33,10 +33,11 @@ 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.AdapterBase;
 
 @Component
 @Local(value={AgentAuthorizer.class, StartupCommandProcessor.class})
-public class BasicAgentAuthManager implements AgentAuthorizer, StartupCommandProcessor {
+public class BasicAgentAuthManager extends AdapterBase implements AgentAuthorizer, StartupCommandProcessor {
     private static final Logger s_logger = Logger.getLogger(BasicAgentAuthManager.class);
     @Inject HostDao _hostDao = null;
     @Inject ConfigurationDao _configDao = null;
@@ -65,20 +66,4 @@ public class BasicAgentAuthManager implements AgentAuthorizer, StartupCommandPro
         _agentManager.registerForInitialConnects(this, true);
         return true;
     }
-
-    @Override
-    public String getName() {
-        return getClass().getName();
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 bcd364e..cd29c70 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -72,6 +72,7 @@ import com.cloud.storage.StoragePoolVO;
 import com.cloud.storage.dao.StoragePoolDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.component.ManagerBase;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.SearchCriteria;
 import com.sun.mail.smtp.SMTPMessage;
@@ -80,7 +81,7 @@ import com.sun.mail.smtp.SMTPTransport;
 
 @Component
 @Local(value={AlertManager.class})
-public class AlertManagerImpl implements AlertManager {
+public class AlertManagerImpl extends ManagerBase implements AlertManager {
     private static final Logger s_logger = Logger.getLogger(AlertManagerImpl.class.getName());
 
     private static final long INITIAL_CAPACITY_CHECK_DELAY = 30L * 1000L; // thirty seconds expressed in milliseconds
@@ -88,7 +89,6 @@ public class AlertManagerImpl implements AlertManager {
     private static final DecimalFormat _dfPct = new DecimalFormat("###.##");
     private static final DecimalFormat _dfWhole = new DecimalFormat("########");
 
-    private String _name = null;
     private EmailAlert _emailAlert;
     @Inject private AlertDao _alertDao;
     @Inject private HostDao _hostDao;
@@ -122,8 +122,6 @@ public class AlertManagerImpl implements AlertManager {
 
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        _name = name;
-
         Map<String, String> configs = _configDao.getConfiguration("management-server", params);
 
         // set up the email system for alerts
@@ -224,11 +222,6 @@ public class AlertManagerImpl implements AlertManager {
     }
 
     @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
     public boolean start() {
         _timer.schedule(new CapacityChecker(), INITIAL_CAPACITY_CHECK_DELAY, _capacityCheckPeriod);
         return true;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/server/src/com/cloud/alert/ClusterAlertAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/ClusterAlertAdapter.java b/server/src/com/cloud/alert/ClusterAlertAdapter.java
index f8b782c..32da042 100644
--- a/server/src/com/cloud/alert/ClusterAlertAdapter.java
+++ b/server/src/com/cloud/alert/ClusterAlertAdapter.java
@@ -30,16 +30,16 @@ import com.cloud.cluster.ClusterNodeJoinEventArgs;
 import com.cloud.cluster.ClusterNodeLeftEventArgs;
 import com.cloud.cluster.ManagementServerHostVO;
 import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.events.EventArgs;
 import com.cloud.utils.events.SubscriptionMgr;
 
 @Component
 @Local(value = AlertAdapter.class)
-public class ClusterAlertAdapter implements AlertAdapter {
+public class ClusterAlertAdapter extends AdapterBase implements AlertAdapter {
 
     private static final Logger s_logger = Logger.getLogger(ClusterAlertAdapter.class);
 
-    private String _name;
     @Inject private AlertManager _alertMgr;
     @Inject private ManagementServerHostDao _mshostDao;
 
@@ -117,19 +117,4 @@ public class ClusterAlertAdapter implements AlertAdapter {
 
         return true;
     }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
index 7e74422..512108c 100644
--- a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
+++ b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
@@ -29,19 +29,18 @@ import com.cloud.consoleproxy.ConsoleProxyAlertEventArgs;
 import com.cloud.consoleproxy.ConsoleProxyManager;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.events.SubscriptionMgr;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.dao.ConsoleProxyDao;
 
 @Component
 @Local(value=AlertAdapter.class)
-public class ConsoleProxyAlertAdapter implements AlertAdapter {
+public class ConsoleProxyAlertAdapter extends AdapterBase implements AlertAdapter {
 
     private static final Logger s_logger = Logger.getLogger(ConsoleProxyAlertAdapter.class);
 
     @Inject private AlertManager _alertMgr;
-    private String _name;
-
     @Inject private DataCenterDao _dcDao;
     @Inject private ConsoleProxyDao _consoleProxyDao;
 
@@ -195,19 +194,4 @@ public class ConsoleProxyAlertAdapter implements AlertAdapter {
 
         return true;
     }
-
-    @Override
-    public String getName() {
-        return _name;
-    }
-
-    @Override
-    public boolean start() {
-        return true;
-    }
-
-    @Override
-    public boolean stop() {
-        return true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/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 faf1a90..2d4a8c3 100644
--- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
+++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
@@ -32,16 +32,16 @@ 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.AdapterBase;
 import com.cloud.utils.events.SubscriptionMgr;
 import com.cloud.vm.SecondaryStorageVmVO;
 import com.cloud.vm.dao.SecondaryStorageVmDao;
 
 @Component
 @Local(value=AlertAdapter.class)
-public class SecondaryStorageVmAlertAdapter implements AlertAdapter {
+public class SecondaryStorageVmAlertAdapter extends AdapterBase implements AlertAdapter {
 	
 	private static final Logger s_logger = Logger.getLogger(SecondaryStorageVmAlertAdapter.class);
-    private String _name;
     
 	@Inject private AlertManager _alertMgr;
 	@Inject private DataCenterDao _dcDao;
@@ -197,19 +197,4 @@ public class SecondaryStorageVmAlertAdapter implements AlertAdapter {
 		
 		return true;
 	}
-
-	@Override
-	public String getName() {
-		return _name;
-	}
-
-	@Override
-	public boolean start() {
-		return true;
-	}
-
-	@Override
-	public boolean stop() {
-		return true;
-	}
 }


Mime
View raw message