Clean up odl-message-bus-collector

This is not an end-user feature and it is quite experimental, with
only provider being NETCONF, and that at beta quality. Move it out
to expertimental features, with adjusted name.

Change-Id: Ib16a322d81c6ac5aa7c8f7b059a949f0473fb2f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0dcc60fdb72fa33a4e4a48e9a8051debce1f64b1..c4c02cf0bb01d63cd0f7eff2c50e66f3d38b0dec 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -212,6 +212,13 @@
                 <artifactId>messagebus-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
                 <artifactId>messagebus-util</artifactId>
                 <version>${project.version}</version>
             </dependency>

+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-exp-messagebus</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>

 
             <!-- Clustering system test support -->
             <dependency>
 
             <!-- Clustering system test support -->
             <dependency>


@@ -322,13 +329,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>

-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-message-bus-collector</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-model-inventory</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-model-inventory</artifactId>

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index 0eeeafd6d4a9383e3a775d37725d162c13e39508..d805039b1550fa029f61d4a6d9cce9de951617b0 100644 (file)
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -36,6 +36,12 @@
     </dependencyManagement>
 
     <dependencies>
     </dependencyManagement>
 
     <dependencies>

+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-exp-messagebus</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-exp-netty-config</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-exp-netty-config</artifactId>

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 9c46956e7b7a222446511fe57cfdebbc55dbd254..638de152963ab2624a2a558238a90b01d15070f7 100644 (file)
--- a/features/features-mdsal/pom.xml
+++ b/features/features-mdsal/pom.xml
@@ -78,13 +78,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-message-bus-collector</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>

         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-toaster</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-toaster</artifactId>

diff --git a/features/odl-message-bus-collector/pom.xml b/features/odl-controller-exp-messagebus/pom.xml
similarity index 92%
rename from features/odl-message-bus-collector/pom.xml
rename to features/odl-controller-exp-messagebus/pom.xml
index fbc133bf69fff2e1ba2420e806fa94713028c47a..6856e23e4a6e662de61844ebc5b6196a465def48 100644 (file)
--- a/features/odl-message-bus-collector/pom.xml
+++ b/features/odl-controller-exp-messagebus/pom.xml
@@ -17,9 +17,11 @@
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>

-    <artifactId>odl-message-bus-collector</artifactId>
+    <artifactId>odl-controller-exp-messagebus</artifactId>

     <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>

+    <name>OpenDaylight :: Controller :: Experimental :: Message Bus</name>
+    <description>Experimental Message Bus Collector</description>

 
     <properties>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
 
     <properties>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>

diff --git a/features/pom.xml b/features/pom.xml
index ad73a9809c4bfc72a4e433429b2b8e085f5db65d..9205f35b921af3c01369fd313b512746748edf48 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -32,6 +32,7 @@
     <!-- Experimental features -->
     <module>features-controller-experimental</module>
     <module>odl-controller-exp-netty-config</module>
     <!-- Experimental features -->
     <module>features-controller-experimental</module>
     <module>odl-controller-exp-netty-config</module>

+    <module>odl-controller-exp-messagebus</module>

 
     <!-- CSIT features -->
     <module>features-controller-testing</module>
 
     <!-- CSIT features -->
     <module>features-controller-testing</module>


@@ -49,7 +50,6 @@
     <module>odl-mdsal-distributed-datastore</module>
     <module>odl-mdsal-model-inventory</module>
     <module>odl-mdsal-remoterpc-connector</module>
     <module>odl-mdsal-distributed-datastore</module>
     <module>odl-mdsal-model-inventory</module>
     <module>odl-mdsal-remoterpc-connector</module>

-    <module>odl-message-bus-collector</module>

     <module>odl-toaster</module>
 
     <!-- Repositories, to be cleaned up -->
     <module>odl-toaster</module>
 
     <!-- Repositories, to be cleaned up -->