Updated Branches: refs/heads/bvt 8e89939be -> 1a31704c0
remove all remnants of simulator from default context All simulator components should be loaded by simulatorComponentContext.xml after this change. The context is enabled by the -Dsimulator flag. Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a31704c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a31704c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a31704c Branch: refs/heads/bvt Commit: 1a31704c0a27b5d6e311313ae94cb9698f46cf87 Parents: 8e89939 Author: Prasanna Santhanam <t...@apache.org> Authored: Sun Mar 24 22:46:14 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Sun Mar 24 22:46:14 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/componentContext.xml.in | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a31704c/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 1052d9e..3e645a0 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -215,11 +215,6 @@ <property name="name" value="KVM Agent"/> </bean> - <bean id="SimulatorDiscoverer" class="com.cloud.resource.SimulatorDiscoverer"> - <property name="name" value="Simulator Agent"/> - </bean> - - <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer"> <property name="name" value="Bare Metal Agent"/> </bean> @@ -316,10 +311,6 @@ <property name="name" value="OvmGuru"/> </bean> - <bean id="SimulatorGuru" class="com.cloud.simulator.SimulatorGuru"> - <property name="name" value="SimulatorGuru"/> - </bean> - <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru"> <property name="name" value="BaremetalGuru"/> </bean>