From: Tony Tkacik <ttkacik@cisco.com>
Date: Mon, 30 Jun 2014 11:24:19 +0000 (+0000)
Subject: Merge "Remove remoterpc dead code."
X-Git-Tag: release/helium~584
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=inline;h=5135f2d97f0886632f3ad3b7160a3be54909810f;hp=-c;p=controller.git

Merge "Remove remoterpc dead code."
---

5135f2d97f0886632f3ad3b7160a3be54909810f
diff --combined opendaylight/commons/opendaylight/pom.xml
index 89f4466a44,17cb9f4034..de8caa0e67
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -2,13 -2,11 +2,13 @@@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
 -    <groupId>org.opendaylight.controller</groupId>
 -    <artifactId>commons.parent</artifactId>
 -    <version>1.0.2-SNAPSHOT</version>
 -    <relativePath>../parent</relativePath>
 +    <groupId>org.opendaylight.odlparent</groupId>
 +    <artifactId>odlparent</artifactId>
 +    <version>1.4.2-SNAPSHOT</version>
 +    <relativePath></relativePath>
    </parent>
 +
 +  <groupId>org.opendaylight.controller</groupId>
    <artifactId>commons.opendaylight</artifactId>
    <version>1.4.2-SNAPSHOT</version>
    <packaging>pom</packaging>
@@@ -17,7 -15,6 +17,7 @@@
    </prerequisites>
  
    <properties>
 +
      <akka.version>2.3.2</akka.version>
      <aopalliance.version>1.0.0</aopalliance.version>
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
@@@ -51,6 -48,7 +51,6 @@@
      <commons.io.version>2.4</commons.io.version>
      <commons.jasper>7.0.32.v201211201952</commons.jasper>
      <commons.juli.version>7.0.32.v201211081135</commons.juli.version>
 -    <commons.lang.version>2.6</commons.lang.version>
      <commons.lang3.version>3.1</commons.lang3.version>
      <commons.logback_settings.version>0.0.2-SNAPSHOT</commons.logback_settings.version>
      <commons.net.version>3.0.1</commons.net.version>
@@@ -61,7 -59,6 +61,7 @@@
      <commons.tomcat.api>7.0.32.v201211081135</commons.tomcat.api>
      <commons.tomcat.util>7.0.32.v201211201952</commons.tomcat.util>
      <compiler.version>2.3.2</compiler.version>
 +    <commons.httpclient.version>0.1.2-SNAPSHOT</commons.httpclient.version>
      <concepts.version>0.5.2-SNAPSHOT</concepts.version>
      <config.version>0.2.5-SNAPSHOT</config.version>
      <configuration.implementation.version>0.4.3-SNAPSHOT</configuration.implementation.version>
@@@ -72,6 -69,8 +72,6 @@@
      <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>
@@@ -81,8 -80,13 +81,8 @@@
      <exam.version>3.0.0</exam.version>
  
      <!-- OpenEXI third party lib for netconf-->
 +
      <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
 -    <failsafe.version>2.15</failsafe.version>
 -    <feature.transaction.version>1.0.1</feature.transaction.version>
 -    <felix.dependencymanager.shell.version>3.0.1</felix.dependencymanager.shell.version>
 -    <felix.dependencymanager.version>3.1.0</felix.dependencymanager.version>
 -    <felix.fileinstall.version>3.1.6</felix.fileinstall.version>
 -    <felix.webconsole.version>4.2.0</felix.webconsole.version>
      <filtervalve.version>1.4.2-SNAPSHOT</filtervalve.version>
      <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.version>
      <flowprogrammer.northbound.version>0.4.2-SNAPSHOT</flowprogrammer.northbound.version>
@@@ -91,6 -95,9 +91,6 @@@
      <forwarding.staticrouting.northbound.version>0.4.2-SNAPSHOT</forwarding.staticrouting.northbound.version>
      <forwardingrulesmanager.implementation.version>0.4.2-SNAPSHOT</forwardingrulesmanager.implementation.version>
      <forwardingrulesmanager.version>0.6.0-SNAPSHOT</forwardingrulesmanager.version>
 -    <geminiweb.version>2.2.0.RELEASE</geminiweb.version>
 -    <gson.version>2.2.4</gson.version>
 -    <guava.version>14.0.1</guava.version>
      <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>
@@@ -101,7 -108,20 +101,7 @@@
      <ietf-restconf.version>2013.10.19.1-SNAPSHOT</ietf-restconf.version>
      <ietf-topology.version>2013.10.21.2-SNAPSHOT</ietf-topology.version>
      <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.version>
 -    <jackson.version>2.3.2</jackson.version>
 -    <jacoco.version>0.6.2.201302030002</jacoco.version>
 -    <jar.plugin.version>2.4</jar.plugin.version>
 -    <java.version.source>1.7</java.version.source>
 -    <java.version.target>1.7</java.version.target>
 -    <javassist.version>3.17.1-GA</javassist.version>
 -    <javax.annotation.version>1.2</javax.annotation.version>
      <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
 -    <!-- Third party version -->
 -    <jersey-servlet.version>1.17</jersey-servlet.version>
 -    <jersey.version>1.17</jersey.version>
 -    <jersey2.publisher.version>4.0</jersey2.publisher.version>
 -    <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>
@@@ -115,9 -135,15 +115,9 @@@
      <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
      <logback.version>1.0.9</logback.version>
      <logging.bridge.version>0.4.2-SNAPSHOT</logging.bridge.version>
 -    <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
 -    <!-- Java Versions -->
 -    <maven.compiler.source>1.7</maven.compiler.source>
 -    <maven.compiler.target>1.7</maven.compiler.target>
      <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
      <mdsal.version>1.1-SNAPSHOT</mdsal.version>
 -    <mockito.version>1.9.5</mockito.version>
      <netconf.version>0.2.5-SNAPSHOT</netconf.version>
 -    <netty.version>4.0.19.Final</netty.version>
      <networkconfig.bridgedomain.northbound.version>0.0.3-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
      <networkconfig.neutron.implementation.version>0.4.2-SNAPSHOT</networkconfig.neutron.implementation.version>
      <networkconfig.neutron.northbound.version>0.4.2-SNAPSHOT</networkconfig.neutron.northbound.version>
@@@ -128,11 -154,18 +128,11 @@@
      <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>
 -    <osgi.compendium.version>5.0.0</osgi.compendium.version>
 -    <osgi.core.version>5.0.0</osgi.core.version>
 -    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 -    <projectinfo>2.6</projectinfo>
      <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
      <protocol-framework.version>0.5.0-SNAPSHOT</protocol-framework.version>
      <protocol_plugins.openflow.version>0.4.2-SNAPSHOT</protocol_plugins.openflow.version>
      <protocol_plugins.stub.version>0.4.2-SNAPSHOT</protocol_plugins.stub.version>
 -    <releaseplugin.version>2.3.2</releaseplugin.version>
      <routing.dijkstra_implementation.version>0.4.2-SNAPSHOT</routing.dijkstra_implementation.version>
      <sal.connection.version>0.1.2-SNAPSHOT</sal.connection.version>
      <sal.implementation.version>0.4.2-SNAPSHOT</sal.implementation.version>
@@@ -146,12 -179,19 +146,12 @@@
      <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>
 -    <slf4j.version>1.7.2</slf4j.version>
      <sonar.branch>${user.name}-private-view</sonar.branch>
      <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
      <!-- Sonar properties using jacoco to retrieve integration test results -->
      <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
      <sonar.language>java</sonar.language>
      <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
 -    <spifly.version>1.0.0</spifly.version>
 -    <spring-osgi.version>1.2.1</spring-osgi.version>
 -    <spring-security-karaf.version>3.1.4.RELEASE</spring-security-karaf.version>
 -    <spring-security.version>3.1.3.RELEASE</spring-security.version>
 -    <spring.version>3.1.3.RELEASE</spring.version>
      <statistics.northbound.version>0.4.2-SNAPSHOT</statistics.northbound.version>
      <statisticsmanager.implementation.version>0.4.2-SNAPSHOT</statisticsmanager.implementation.version>
      <statisticsmanager.version>0.5.1-SNAPSHOT</statisticsmanager.version>
@@@ -165,11 -205,14 +165,11 @@@
      <topology.web.version>0.4.2-SNAPSHOT</topology.web.version>
      <topologymanager.version>0.4.2-SNAPSHOT</topologymanager.version>
      <troubleshoot.web.version>0.4.2-SNAPSHOT</troubleshoot.web.version>
 -    <url.version>1.5.0</url.version>
      <usermanager.implementation.version>0.4.2-SNAPSHOT</usermanager.implementation.version>
      <usermanager.northbound.version>0.0.2-SNAPSHOT</usermanager.northbound.version>
      <usermanager.version>0.4.2-SNAPSHOT</usermanager.version>
 -    <virgo.version>3.6.0.RELEASE</virgo.version>
      <web.version>0.4.2-SNAPSHOT</web.version>
      <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>
@@@ -177,7 -220,7 +177,7 @@@
  
    <dependencyManagement>
      <dependencies>
 -
 +       <!-- project specific dependencies -->
        <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>ietf-netconf-monitoring</artifactId>
@@@ -996,12 -1039,12 +996,12 @@@
          <artifactId>netconf-client</artifactId>
          <version>${netconf.version}</version>
        </dependency>
 -        <dependency>
 -            <groupId>org.opendaylight.controller</groupId>
 -            <artifactId>netconf-client</artifactId>
 -            <version>${netconf.version}</version>
 -            <type>test-jar</type>
 -        </dependency>
 +      <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>netconf-client</artifactId>
 +        <version>${netconf.version}</version>
 +        <type>test-jar</type>
 +      </dependency>
  
        <!--Netconf config-->
        <dependency>
@@@ -1126,11 -1169,6 +1126,6 @@@
          <artifactId>protocol_plugins.stub</artifactId>
          <version>${protocol_plugins.stub.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>remoterpc-routingtable.implementation</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>routing.dijkstra_implementation</artifactId>
@@@ -1218,11 -1256,6 +1213,6 @@@
          <artifactId>sal-remote</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-remoterpc-connector</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>sal-rest-connector</artifactId>
@@@ -1479,16 -1512,6 +1469,6 @@@
          <artifactId>sample-toaster-provider</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.tests</groupId>
-         <artifactId>sal-remoterpc-connector-test-consumer</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.tests</groupId>
-         <artifactId>sal-remoterpc-connector-test-provider</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>com.sun.jersey.jersey-servlet</artifactId>
@@@ -1688,6 -1711,18 +1668,6 @@@
          <artifactId>org.osgi.core</artifactId>
          <version>${osgi.core.version}</version>
        </dependency>
 -
 -      <dependency>
 -        <groupId>org.ow2.asm</groupId>
 -        <artifactId>asm-all</artifactId>
 -        <version>4.1</version>
 -      </dependency>
 -      <!-- Visual VM hook -->
 -      <dependency>
 -        <groupId>org.ow2.chameleon.management</groupId>
 -        <artifactId>chameleon-mbeans</artifactId>
 -        <version>1.0.0</version>
 -      </dependency>
        <dependency>
          <groupId>org.reflections</groupId>
          <artifactId>reflections</artifactId>
@@@ -1719,12 -1754,95 +1699,12 @@@
          <artifactId>slf4j-simple</artifactId>
          <version>${slf4j.version}</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.aop</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.asm</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.beans</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.context</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.context.support</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.core</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.expression</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.transaction</artifactId>
 -        <version>${spring-security.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.web</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework</groupId>
 -        <artifactId>org.springframework.web.servlet</artifactId>
 -        <version>${spring.version}</version>
 -      </dependency>
 -
 -      <!-- Spring security -->
 -      <dependency>
 -        <groupId>org.springframework.security</groupId>
 -        <artifactId>spring-security-config</artifactId>
 -        <version>${spring-security.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework.security</groupId>
 -        <artifactId>spring-security-core</artifactId>
 -        <version>${spring-security.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework.security</groupId>
 -        <artifactId>spring-security-taglibs</artifactId>
 -        <version>${spring-security.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.springframework.security</groupId>
 -        <artifactId>spring-security-web</artifactId>
 -        <version>${spring-security.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>virgomirror</groupId>
 -        <artifactId>org.eclipse.jdt.core.compiler.batch</artifactId>
 -        <version>3.8.0.I20120518-2145</version>
 -      </dependency>
        <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
          <version>${junit.version}</version>
          <scope>test</scope>
        </dependency>
 -      <dependency>
 -        <groupId>org.mockito</groupId>
 -        <artifactId>mockito-all</artifactId>
 -        <version>${mockito.version}</version>
 -        <scope>test</scope>
 -      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>commons.logback_settings</artifactId>
@@@ -1750,6 -1868,44 +1730,6 @@@
          <version>${yangtools.version}</version>
          <scope>test</scope>
        </dependency>
 -      <!-- Add Pax Exam -->
 -      <dependency>
 -        <groupId>org.ops4j.pax.exam</groupId>
 -        <artifactId>pax-exam-container-native</artifactId>
 -        <version>${exam.version}</version>
 -        <scope>test</scope>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.ops4j.pax.exam</groupId>
 -        <artifactId>pax-exam-junit4</artifactId>
 -        <version>${exam.version}</version>
 -        <scope>test</scope>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.ops4j.pax.exam</groupId>
 -        <artifactId>pax-exam-link-mvn</artifactId>
 -        <version>${exam.version}</version>
 -        <scope>test</scope>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.ops4j.pax.url</groupId>
 -        <artifactId>pax-url-aether</artifactId>
 -        <version>${url.version}</version>
 -        <scope>test</scope>
 -      </dependency>
 -
 -      <dependency>
 -        <groupId>org.springframework.osgi</groupId>
 -        <artifactId>spring-osgi-mock</artifactId>
 -        <version>${spring-osgi.version}</version>
 -        <scope>test</scope>
 -      </dependency>
 -      <dependency>
 -        <groupId>xmlunit</groupId>
 -        <artifactId>xmlunit</artifactId>
 -        <version>1.5</version>
 -        <scope>test</scope>
 -      </dependency>
      </dependencies>
    </dependencyManagement>
  
@@@ -2008,21 -2164,6 +1988,21 @@@
                      <ignore></ignore>
                    </action>
                  </pluginExecution>
 +                <pluginExecution>
 +                  <pluginExecutionFilter>
 +                    <groupId>org.codehaus.mojo</groupId>
 +                    <artifactId>javacc-maven-plugin</artifactId>
 +                    <versionRange>[0.0,)</versionRange>
 +                    <goals>
 +                      <goal>javacc</goal>
 +                    </goals>
 +                  </pluginExecutionFilter>
 +                  <action>
 +                    <execute>
 +                      <runOnIncremental>false</runOnIncremental>
 +                    </execute>
 +                  </action>
 +                </pluginExecution>
                </pluginExecutions>
              </lifecycleMappingMetadata>
            </configuration>
@@@ -2255,7 -2396,7 +2235,7 @@@
        </snapshots>
        <id>opendaylight-mirror</id>
        <name>opendaylight-mirror</name>
 -      <url>${nexusproxy}/groups/public/</url>
 +      <url>http://nexus.opendaylight.org/content/groups/public/</url>
      </repository>
      <!-- OpenDayLight Snapshot artifact -->
      <repository>
@@@ -2267,7 -2408,7 +2247,7 @@@
        </snapshots>
        <id>opendaylight-snapshot</id>
        <name>opendaylight-snapshot</name>
 -      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
 +      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
      </repository>
    </repositories>
  
@@@ -2283,7 -2424,7 +2263,7 @@@
        </snapshots>
        <id>opendaylight-mirror</id>
        <name>opendaylight-mirror</name>
 -      <url>${nexusproxy}/groups/public/</url>
 +      <url>http://nexus.opendaylight.org/content/groups/public/</url>
      </pluginRepository>
      <!-- OpenDayLight Snapshot artifact -->
      <pluginRepository>
@@@ -2295,19 -2436,19 +2275,19 @@@
        </snapshots>
        <id>opendaylight-snapshot</id>
        <name>opendaylight-snapshot</name>
 -      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
 +      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
      </pluginRepository>
    </pluginRepositories>
    <distributionManagement>
      <!-- OpenDayLight Released artifact -->
      <repository>
        <id>opendaylight-release</id>
 -      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>
 +      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
      </repository>
      <!-- OpenDayLight Snapshot artifact -->
      <snapshotRepository>
        <id>opendaylight-snapshot</id>
 -      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
 +      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
      </snapshotRepository>
      <!-- Site deployment -->
      <site>
diff --combined opendaylight/distribution/opendaylight/pom.xml
index 149154334d,b9cfb0f7a6..ef3b5f4fd9
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -935,12 -935,6 +935,6 @@@
            <artifactId>protocol-framework</artifactId>
          </dependency>
  
-         <!-- clustering -->
-         <dependency>
-           <groupId>org.opendaylight.controller</groupId>
-           <artifactId>remoterpc-routingtable.implementation</artifactId>
-           <version>${mdsal.version}</version>
-         </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-binding-api</artifactId>
@@@ -996,21 -990,12 +990,17 @@@
          </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>sal-inmemory-datastore</artifactId>
 +          <version>1.1-SNAPSHOT</version>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-netconf-connector</artifactId>
          </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-remote</artifactId>
          </dependency>
-         <dependency>
-           <groupId>org.opendaylight.controller</groupId>
-           <artifactId>sal-remoterpc-connector</artifactId>
-         </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-rest-connector</artifactId>
diff --combined opendaylight/md-sal/pom.xml
index 8f11b955a0,174f635a13..24dcfad02b
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@@ -54,20 -54,11 +54,17 @@@
      <!-- Compability Packages -->
      <module>compatibility</module>
  
-     <!-- Clustering -->
-     <module>remoterpc-routingtable/implementation</module>
-     <module>sal-remoterpc-connector/implementation</module>
      <!-- Documentation -->
      <module>sal-rest-docgen</module>
  
 -    <!--  Karaf feature -->
 -    <module>feature</module>
 +    <!--InMemory DOM DataStore-->
 +    <module>sal-inmemory-datastore</module>
 +
 +    <!--sal-protocolbuffer-encoding-->
 +    <module>sal-protocolbuffer-encoding</module>
 +
 +      <!--  Karaf feature -->
 +      <module>feature</module>
  
    </modules>