Merge "added containermanager shell feature"

diff --combined opendaylight/commons/opendaylight/pom.xml
index 5e146e6664f253535d2d4f77cccb573d18ec405f,59fc760432107c3e7109a52adc65962dc90bfc79..c58aaf266c7766b5a21f61b97999d76183ce836c
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -15,16 -15,19 +15,20 @@@
    </prerequisites>
  
    <properties>
 +    <akka.version>2.3.2</akka.version>
      <aopalliance.version>1.0.0</aopalliance.version>
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
+     <archetype-app-northbound>0.0.1-SNAPSHOT</archetype-app-northbound>
      <aries.util.version>1.1.0</aries.util.version>
      <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
+     <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
      <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <bouncycastle.version>1.50</bouncycastle.version>
      <bundle.plugin.version>2.4.0</bundle.plugin.version>
+     <bundlescanner.api.version>0.4.2-SNAPSHOT</bundlescanner.api.version>
+     <bundlescanner.implementation.version>0.4.2-SNAPSHOT</bundlescanner.implementation.version>
      <bundlescanner.version>0.4.2-SNAPSHOT</bundlescanner.version>
      <checkstyle.version>2.10</checkstyle.version>
      <clustering.services.version>0.5.1-SNAPSHOT</clustering.services.version>
@@@ -32,13 -35,19 +36,19 @@@
      <clustering.stub.version>0.4.2-SNAPSHOT</clustering.stub.version>
      <clustering.test.version>0.4.2-SNAPSHOT</clustering.test.version>
      <commmons.northbound.version>0.4.2-SNAPSHOT</commmons.northbound.version>
+     <commons.checkstyle.version>0.0.3-SNAPSHOT</commons.checkstyle.version>
      <!-- Third Party Versions -->
      <commons.codec.version>1.7</commons.codec.version>
      <commons.fileupload.version>1.2.2</commons.fileupload.version>
      <commons.httpclient.version>0.1.2-SNAPSHOT</commons.httpclient.version>
      <commons.io.version>2.4</commons.io.version>
      <commons.lang.version>3.1</commons.lang.version>
+     <commons.logback_settings.version>0.0.2-SNAPSHOT</commons.logback_settings.version>
      <commons.net.version>3.0.1</commons.net.version>
+     <commons.opendaylight.commons.httpclient>0.1.2-SNAPSHOT</commons.opendaylight.commons.httpclient>
+     <commons.opendaylight.concepts.version>0.5.2-SNAPSHOT</commons.opendaylight.concepts.version>
+     <commons.opendaylight.version>1.4.2-SNAPSHOT</commons.opendaylight.version>
+     <commons.parent.version>1.0.2-SNAPSHOT</commons.parent.version>
      <compiler.version>2.3.2</compiler.version>
      <concepts.version>0.5.2-SNAPSHOT</concepts.version>
      <config.version>0.2.5-SNAPSHOT</config.version>
@@@ -47,11 -56,13 +57,13 @@@
      <connectionmanager.version>0.1.2-SNAPSHOT</connectionmanager.version>
      <containermanager.it.version>0.5.2-SNAPSHOT</containermanager.it.version>
      <containermanager.northbound.version>0.4.2-SNAPSHOT</containermanager.northbound.version>
+     <containermanager.shell.version>0.5.2-SNAPSHOT</containermanager.shell.version>
      <containermanager.version>0.5.2-SNAPSHOT</containermanager.version>
      <controllermanager.northbound.version>0.0.2-SNAPSHOT</controllermanager.northbound.version>
      <corsfilter.version>7.0.42</corsfilter.version>
      <ctrie.version>0.2.0</ctrie.version>
      <devices.web.version>0.4.2-SNAPSHOT</devices.web.version>
+     <dummy-console.version>1.1.0-SNAPSHOT</dummy-console.version>
      <eclipse.persistence.version>2.5.0</eclipse.persistence.version>
      <!-- enforcer version -->
      <enforcer.version>1.3.1</enforcer.version>
@@@ -80,6 -91,8 +92,8 @@@
      <hosttracker.implementation.version>0.5.2-SNAPSHOT</hosttracker.implementation.version>
      <hosttracker.northbound.version>0.4.2-SNAPSHOT</hosttracker.northbound.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>
      <ietf-inet-types.version>2010.09.24.4-SNAPSHOT</ietf-inet-types.version>
      <ietf-restconf.version>2013.10.19.1-SNAPSHOT</ietf-restconf.version>
      <ietf-topology.version>2013.10.21.2-SNAPSHOT</ietf-topology.version>
@@@ -98,12 -111,14 +112,14 @@@
      <jersey2.version>2.8</jersey2.version>
      <jettison.version>1.3.3</jettison.version>
      <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+     <jolokia-bridge.version>0.0.2-SNAPSHOT</jolokia-bridge.version>
      <jolokia.version>1.1.4</jolokia.version>
      <jsr305.api.version>2.0.1</jsr305.api.version>
      <jsr311.api.version>1.1.1</jsr311.api.version>
      <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
      <junit.version>4.8.1</junit.version>
      <karaf.branding.version>1.0.0-SNAPSHOT</karaf.branding.version>
+     <karaf.shell.version>3.0.0</karaf.shell.version>
      <karaf.version>3.0.1</karaf.version>
      <logback.version>1.0.9</logback.version>
      <logging.bridge.version>0.4.2-SNAPSHOT</logging.bridge.version>
@@@ -121,6 -136,9 +137,9 @@@
      <networkconfig.neutron.version>0.4.2-SNAPSHOT</networkconfig.neutron.version>
      <!-- ODL repository / plugin repository -->
      <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+     <northbound.commons.version>0.4.2-SNAPSHOT</northbound.commons.version>
+     <northbound.hosttracker.version>1.4.2-SNAPSHOT</northbound.hosttracker.version>
+     <northbound.jolokia.version>1.4.2-SNAPSHOT</northbound.jolokia.version>
      <opendaylight-l2-types.version>2013.08.27.4-SNAPSHOT</opendaylight-l2-types.version>
      <org.json.version>20080701</org.json.version>
      <osgi-brandfragment.web.version>0.0.2-SNAPSHOT</osgi-brandfragment.web.version>
@@@ -144,7 -162,6 +163,7 @@@
      <samples.loadbalancer.northbound.version>0.4.2-SNAPSHOT</samples.loadbalancer.northbound.version>
      <samples.simpleforwarding.version>0.4.2-SNAPSHOT</samples.simpleforwarding.version>
      <sanitytest.version>0.4.2-SNAPSHOT</sanitytest.version>
 +    <scala.version>2.11</scala.version>
      <security.version>0.4.2-SNAPSHOT</security.version>
      <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
      <siteplugin>3.2</siteplugin>
@@@ -182,6 -199,7 +201,7 @@@
      <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
      <xtend.version>2.4.3</xtend.version>
      <yang-ext.version>2013.09.07.4-SNAPSHOT</yang-ext.version>
+     <yang-jmx-generator.version>1.0.0-SNAPSHOT</yang-jmx-generator.version>
      <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
    </properties>
  
@@@ -281,36 -299,11 +301,36 @@@
          <artifactId>jersey-core</artifactId>
          <version>${jersey.version}</version>
        </dependency>
 +
        <dependency>
          <groupId>com.sun.jersey</groupId>
          <artifactId>jersey-server</artifactId>
          <version>${jersey.version}</version>
        </dependency>
 +
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-actor_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-cluster_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-persistence-experimental_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>com.typesafe.akka</groupId>
 +        <artifactId>akka-remote_${scala.version}</artifactId>
 +        <version>${akka.version}</version>
 +      </dependency>
        <dependency>
          <groupId>commons-codec</groupId>
          <artifactId>commons-codec</artifactId>
@@@ -840,6 -833,11 +860,11 @@@
          <artifactId>containermanager.northbound</artifactId>
          <version>${containermanager.northbound.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>containermanager.shell</artifactId>
+         <version>${containermanager.shell.version}</version>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>controllermanager.northbound</artifactId>
@@@ -1597,11 -1595,6 +1622,11 @@@
          <artifactId>chameleon-mbeans</artifactId>
          <version>1.0.0</version>
        </dependency>
 +      <dependency>
 +        <groupId>org.scala-lang</groupId>
 +        <artifactId>scala-library</artifactId>
 +        <version>${scala.version}.1</version>
 +      </dependency>
        <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>jcl-over-slf4j</artifactId>