Refactor odl-mdsal-remoterpc-connector

RPC connector has a logical dependency on components present
in the distributed datastore. This refactors it to take that
into account.

JIRA: CONTROLLER-1584
Change-Id: Icd0145b35310133822ee02cdf4a3d4cffbc6e257
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index 8c7d1e6575f3fab67337cfdcdc60d72705fe00ce..4844b995b6b8665b09ffb0e1a1420b65cf58e491 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -36,5 +36,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <!-- FIXME: this is not quite right -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-mdsal-broker-local</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
index 4142290237a7c0ad657ce4aa41086832ffff6c5f..633f8d307d9debe4c6296121f16d785cacb245b8 100644 (file)
--- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
@@ -21,37 +21,31 @@
     <version>1.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <properties>
-        <!-- CONTROLLER-1584 -->
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-    </properties>
+    <name>OpenDaylight :: Controller :: Remote RPC Connector</name>
+    <description>Clustering remote RPC support</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-broker-local</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-mdsal-clustering-commons</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-akka-leveldb-0.10</artifactId>
-            <version>5.0.0</version>
+            <artifactId>odl-mdsal-distributed-datastore</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-remoterpc-connector</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml
deleted file mode 100644 (file)
index b4f9bcb..0000000
--- a/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © 2017 Red Hat, Inc. and others.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
-  -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
-    <feature name="odl-mdsal-remoterpc-connector" version="${project.version}">
-        <feature version="[5,6)">odl-akka-leveldb-0.10</feature>
-    </feature>
-</features>