Updated Branches: refs/heads/master 0d62549d6 -> 873ec2713
simulator: by default don't start the simulator discoverers Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/873ec271 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/873ec271 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/873ec271 Branch: refs/heads/master Commit: 873ec27135628a81252875693d11667c18bb1589 Parents: 0d62549 Author: Prasanna Santhanam <[email protected]> Authored: Wed Mar 20 14:52:32 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Mar 20 14:52:32 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/componentContext.xml.in | 6 ++++++ .../resource/SimulatorSecondaryDiscoverer.java | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/873ec271/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index b536879..2535c77 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -207,6 +207,12 @@ <property name="name" value="XCP Agent"/> </bean> + <!-- + <bean id="SimulatorSecondaryStorageDiscoverer" class="com.cloud.resource.SimulatorSecondaryDiscoverer"> + <property name="name" value="SecondaryStorage"/> + </bean> + --> + <bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"> <property name="name" value="SecondaryStorage"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/873ec271/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java index 1dd71c5..3a8cf17 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java @@ -44,7 +44,7 @@ import com.cloud.storage.secondary.SecondaryStorageDiscoverer; import com.cloud.utils.exception.CloudRuntimeException; import org.springframework.stereotype.Component; -@Component + @Local(value=Discoverer.class) public class SimulatorSecondaryDiscoverer extends SecondaryStorageDiscoverer implements ResourceStateAdapter, Listener { private static final Logger s_logger = Logger.getLogger(SimulatorSecondaryDiscoverer.class);
