From 873ec27135628a81252875693d11667c18bb1589 Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Wed, 20 Mar 2013 14:52:32 +0530
Subject: [PATCH] simulator: by default don't start the simulator discoverers

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
---
 client/tomcatconf/componentContext.xml.in                   | 6 ++++++
 .../com/cloud/resource/SimulatorSecondaryDiscoverer.java    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index b536879044b..2535c779368 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>
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java
index 1dd71c5c27f..3a8cf17e24b 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);