From: Madhu Venugopal <mavenugo@gmail.com>
Date: Sat, 2 Aug 2014 07:36:26 +0000 (+0000)
Subject: Merge "added feature topology manager shell"
X-Git-Tag: release/helium~363
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=475d28f717bae92b2cc10b0589131771fcc62242;hp=-c

Merge "added feature topology manager shell"
---

475d28f717bae92b2cc10b0589131771fcc62242
diff --combined features/nsf/src/main/resources/features.xml
index cc3e274ef9,37c69cf753..130d72e01a
--- a/features/nsf/src/main/resources/features.xml
+++ b/features/nsf/src/main/resources/features.xml
@@@ -34,13 -34,13 +34,14 @@@
          <bundle>mvn:org.opendaylight.controller/forwardingrulesmanager.implementation/${forwardingrulesmanager.implementation.version}</bundle>
  
          <bundle>mvn:org.opendaylight.controller/topologymanager/${topologymanager.version}</bundle>
+         <bundle>mvn:org.opendaylight.controller/topologymanager.shell/${topologymanager.shell.version}</bundle>
  
          <bundle>mvn:org.opendaylight.controller/networkconfig.neutron/${networkconfig.neutron.version}</bundle>
          <bundle>mvn:org.opendaylight.controller/networkconfig.neutron.implementation/${networkconfig.neutron.implementation.version}</bundle>
  
          <bundle>mvn:org.opendaylight.controller/hosttracker/${hosttracker.api.version}</bundle>
          <bundle>mvn:org.opendaylight.controller/hosttracker.implementation/${hosttracker.implementation.version}</bundle>
 +        <bundle>mvn:org.opendaylight.controller/hosttracker.shell/${hosttracker.shell.version}</bundle>
  
          <bundle>mvn:org.opendaylight.controller/forwarding.staticrouting</bundle>
  
@@@ -71,4 -71,4 +72,4 @@@
          <bundle>mvn:org.opendaylight.controller/topology.northbound/${topology.northbound.version}</bundle>
          <bundle>mvn:org.opendaylight.controller/usermanager.northbound/${usermanager.northbound.version}</bundle>
      </feature>
- </features>
+ </features>
diff --combined opendaylight/commons/opendaylight/pom.xml
index dd7d7dfbb9,235b95b742..b44a7212ca
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -95,7 -95,6 +95,7 @@@
      <hosttracker.api.version>0.5.2-SNAPSHOT</hosttracker.api.version>
      <hosttracker.implementation.version>0.5.2-SNAPSHOT</hosttracker.implementation.version>
      <hosttracker.northbound.version>0.4.2-SNAPSHOT</hosttracker.northbound.version>
 +    <hosttracker.shell.version>1.0.0-SNAPSHOT</hosttracker.shell.version>
      <hosttracker_new.api.version>0.4.2-SNAPSHOT</hosttracker_new.api.version>
      <hosttracker_new.implementation.version>0.4.2-SNAPSHOT</hosttracker_new.implementation.version>
      <httpservice-bridge.northbound.version>0.0.2-SNAPSHOT</httpservice-bridge.northbound.version>
@@@ -180,6 -179,7 +180,7 @@@
      <topology.northbound.version>0.4.2-SNAPSHOT</topology.northbound.version>
      <topology.web.version>0.4.2-SNAPSHOT</topology.web.version>
      <topologymanager.version>0.4.2-SNAPSHOT</topologymanager.version>
+     <topologymanager.shell.version>1.0.0-SNAPSHOT</topologymanager.shell.version>
      <troubleshoot.web.version>0.4.2-SNAPSHOT</troubleshoot.web.version>
      <typesafe.config.version>1.2.0</typesafe.config.version>
      <uncommons.maths.version>1.2.2</uncommons.maths.version>
@@@ -1241,26 -1241,6 +1242,26 @@@
          <artifactId>sal-rest-connector-config</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>config-netty-config</artifactId>
 +        <version>${config.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>md-sal-config</artifactId>
 +        <version>${mdsal.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>netconf-config</artifactId>
 +        <version>${netconf.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>netconf-connector-config</artifactId>
 +        <version>${netconf.version}</version>
 +      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>sal-rest-docgen</artifactId>
@@@ -1517,11 -1497,6 +1518,11 @@@
          <artifactId>sample-toaster-provider</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.controller.samples</groupId>
 +        <artifactId>toaster-config</artifactId>
 +        <version>${mdsal.version}</version>
 +      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>com.sun.jersey.jersey-servlet</artifactId>