Put nonoss under Spring framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/af4485ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/af4485ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/af4485ae Branch: refs/heads/master Commit: af4485ae9e3a4b62887a3326e42a07d5fa7936a4 Parents: fc7d073 Author: Kelven Yang <[email protected]> Authored: Fri Jan 25 15:41:31 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Fri Jan 25 15:41:48 2013 -0800 ---------------------------------------------------------------------- .../vmware/src/com/cloud/ha/VmwareFencer.java | 1 - .../src/com/cloud/ha/VmwareInvestigator.java | 3 --- .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 1 - .../hypervisor/vmware/VmwareServerDiscoverer.java | 3 --- .../vmware/manager/VmwareManagerImpl.java | 2 -- .../network/element/CiscoNexusVSMElement.java | 3 --- .../element/JuniperSRXExternalFirewallElement.java | 2 -- .../cloud/network/element/NetscalerElement.java | 1 - utils/src/com/cloud/utils/db/GenericDaoBase.java | 9 +++++++++ 9 files changed, 9 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/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 b762714..13cf065 100644 --- 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 org.springframework.stereotype.Component; import com.cloud.host.HostVO; import com.cloud.vm.VMInstanceVO; -@Component @Local(value=FenceBuilder.class) public class VmwareFencer implements FenceBuilder { String _name; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java index 2f63948..a7e67e1 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java +++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java @@ -18,15 +18,12 @@ package com.cloud.ha; 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() { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index 638b0e3..819d399 100644 --- 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.VirtualMachine; 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); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index b51e9df..ac0f6f4 100755 --- 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.inject.Inject; 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.cloud.utils.UriUtils; import com.vmware.vim25.ClusterDasConfigInfo; import com.vmware.vim25.ManagedObjectReference; -@Component @Local(value = Discoverer.class) public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer, ResourceStateAdapter { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/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 1e941b7..16fd3d7 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 @@ -36,7 +36,6 @@ import javax.inject.Inject; 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.apputils.vim25.ServiceUtil; 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); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java index 60d9c96..daf7dd6 100644 --- 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 java.util.Set; 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.exception.ResourceInUseException; 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 { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java index 622b55c..1bc3d91 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java @@ -28,7 +28,6 @@ import javax.inject.Inject; 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.ReservationContext; 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}) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 5a03c0e..8f902df 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -111,7 +111,6 @@ import com.cloud.vm.VirtualMachine; 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 { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af4485ae/utils/src/com/cloud/utils/db/GenericDaoBase.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoBase.java index c083e3a..5a166b2 100755 --- 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 abstract class GenericDaoBase<T, ID extends Serializable> implements Gene 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() {
