Put nonoss under Spring framework

kelveny · kelveny · commit af4485ae9e3a · 2013-01-25T15:41:48.000-08:00
diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareFencer.java
@@ -26,7 +26,6 @@
 import com.cloud.host.HostVO;
 import com.cloud.vm.VMInstanceVO;
 
-@Component
 @Local(value=FenceBuilder.class)
 public class VmwareFencer implements FenceBuilder {
     String _name;
diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java
@@ -18,15 +18,12 @@
 
 import javax.ejb.Local;
 
-import org.springframework.stereotype.Component;
-
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.VMInstanceVO;
 
-@Component
 @Local(value=Investigator.class)
 public class VmwareInvestigator extends AdapterBase implements Investigator {
     protected VmwareInvestigator() {
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -70,7 +70,6 @@
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VmDetailConstants;
 
-@Component
 @Local(value=HypervisorGuru.class)
 public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
     private static final Logger s_logger = Logger.getLogger(VMwareGuru.class);
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -28,12 +28,10 @@
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
 
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
 import com.cloud.alert.AlertManager;
-import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter.NetworkType;
@@ -70,7 +68,6 @@
 import com.vmware.vim25.ClusterDasConfigInfo;
 import com.vmware.vim25.ManagedObjectReference;
 
-@Component
 @Local(value = Discoverer.class)
 public class VmwareServerDiscoverer extends DiscovererBase implements
 		Discoverer, ResourceStateAdapter {
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
@@ -36,7 +36,6 @@
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
@@ -94,7 +93,6 @@
 import com.vmware.vim25.HostConnectSpec;
 import com.vmware.vim25.ManagedObjectReference;
 
-@Component
 @Local(value = {VmwareManager.class})
 public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Listener, Manager {
     private static final Logger s_logger = Logger.getLogger(VmwareManagerImpl.class);
diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java
@@ -27,9 +27,7 @@
 import javax.ejb.Local;
 import javax.inject.Inject;
 
-import com.cloud.utils.PropertiesUtil;
 import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
 
 import com.cloud.api.commands.DeleteCiscoNexusVSMCmd;
 import com.cloud.api.commands.EnableCiscoNexusVSMCmd;
@@ -62,7 +60,6 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.server.ManagementService;
 
-@Component
 @Local(value = NetworkElement.class)
 public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl implements CiscoNexusVSMElementService, NetworkElement, Manager {
 
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
@@ -28,7 +28,6 @@
 import org.apache.cloudstack.api.response.ExternalFirewallResponse;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
 import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.commands.AddExternalFirewallCmd;
@@ -91,7 +90,6 @@
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 
-@Component
 @Local(value = {NetworkElement.class, FirewallServiceProvider.class, 
         PortForwardingServiceProvider.class, IpDeployer.class, 
         SourceNatServiceProvider.class, RemoteAccessVPNServiceProvider.class})
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
@@ -111,7 +111,6 @@
 import com.cloud.vm.VirtualMachineProfile;
 import com.google.gson.Gson;
 
-@Component
 @Local(value = {NetworkElement.class, StaticNatServiceProvider.class, LoadBalancingServiceProvider.class})
 public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, IpDeployer,
 StaticNatServiceProvider {
diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoBase.java
@@ -158,6 +158,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> implements Gene
     protected static final SequenceFetcher s_seqFetcher = SequenceFetcher.getInstance();
 
     protected String _name;
+    protected Map<String, Object> _configParams = new HashMap<String, Object>();
 
     public static <J> GenericDaoBase<? extends J, ? extends Serializable> getDao(Class<J> entityType) {
         @SuppressWarnings("unchecked")
@@ -179,6 +180,14 @@ public <J> GenericSearchBuilder<T, J> createSearchBuilder(Class<J> resultType) {
     public Map<String, Attribute> getAllAttributes() {
         return _allAttributes;
     }
+    
+    public void setConfigParams(Map<String, Object> params) {
+    	_configParams = params;
+    }
+    
+    public Map<String, Object> getConfigParams() {
+    	return _configParams;
+    }
 
     @SuppressWarnings("unchecked")
     protected GenericDaoBase() {
