NiciraNvpElement is loaded twice, but no idea where. This makes it work however(cherry picked from commit 43dc31bcf2cf985bd7f49b4dbc6814627cb3eb1d)
Signed-off-by: Hugo Trippaers <[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/cb4d498d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cb4d498d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cb4d498d Branch: refs/heads/4.1 Commit: cb4d498da146f9705892970c27ca4a5a6bc34da9 Parents: 6dabb5b Author: Hugo Trippaers <[email protected]> Authored: Mon Feb 4 15:07:55 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Feb 5 21:12:11 2013 +0100 ---------------------------------------------------------------------- client/tomcatconf/componentContext.xml.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cb4d498d/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 9099b91..f65a8b6 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">
