From cb4d498da146f9705892970c27ca4a5a6bc34da9 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Mon, 4 Feb 2013 15:07:55 +0100
Subject: [PATCH] NiciraNvpElement is loaded twice, but no idea where. This
 makes it work however(cherry picked from commit
 43dc31bcf2cf985bd7f49b4dbc6814627cb3eb1d)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
---
 client/tomcatconf/componentContext.xml.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 9099b91887b..f65a8b6ca13 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -76,9 +76,11 @@
   <bean id="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement">
     <property name="name" value="VpcVirtualRouter"/>
   </bean>
+  <!--
   <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
     <property name="name" value="NiciraNvp"/>
   </bean>
+  -->
   
 <!--
   <bean id="BigSwitchVnsElementService" class="com.cloud.network.element.BigSwitchVnsElement">