Rename odl-restconf-base to odl-restconf-nb-bierman02-base

This feature is hosting the base bierman02 bundle and configuration,
hence it should be named accordingly.

This reduces confusion a bit and allows us to install both
northbounds simultaneously.

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

diff --git a/features/restconf/odl-restconf-base/pom.xml b/features/restconf/odl-restconf-nb-bierman02-base/pom.xml
similarity index 95%
rename from features/restconf/odl-restconf-base/pom.xml
rename to features/restconf/odl-restconf-nb-bierman02-base/pom.xml
index ba6fbcbaefe82f94c4b1c86010677f224a0c6d2f..80b8c5b5d85ab0c5e71251f12bf0767a6c1c6b7d 100644 (file)
--- a/features/restconf/odl-restconf-base/pom.xml
+++ b/features/restconf/odl-restconf-nb-bierman02-base/pom.xml
@@ -17,11 +17,11 @@
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>odl-restconf-base</artifactId>
+    <artifactId>odl-restconf-nb-bierman02-base</artifactId>
     <version>1.9.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Restconf :: Base</name>
+    <name>OpenDaylight :: Restconf :: NB :: bierman02 :: Base</name>
 
     <dependencyManagement>
         <dependencies>

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index a82d7e0dca21deeb68f0a193d617f9d2796347c8..ab6908ea2104796ad8f05e8d97e61c34389b9873 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -21,7 +21,7 @@
     <version>1.9.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Restconf NB - RFC8040</name>
+    <name>OpenDaylight :: Restconf :: NB :: RFC8040</name>
 
     <dependencyManagement>
         <dependencies>

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index 067a9d22ee422e798e9d662fa26ccb673dd146b5..15cc9bac3f8db3ae88f89b1b5cc825b3319ca14f 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -21,7 +21,7 @@
     <version>1.9.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Restconf</name>
+    <name>OpenDaylight :: Restconf :: no-auth</name>
 
     <dependencyManagement>
         <dependencies>
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-base</artifactId>
+            <artifactId>odl-restconf-nb-bierman02-base</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index 77d27231c3089cf4ef39afa37bddcd0332e824e6..dbf08b4a8369f14fffda86fa2609af923d468bf9 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf-base</artifactId>
+            <artifactId>odl-restconf-nb-bierman02-base</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 8105b7792c7e2c8f0b5bd30da438f37bc4a27ec0..37e6a290d9cbf833e53ca98fc1c29a3a2f8a8293 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -27,12 +27,12 @@
 
     <modules>
         <module>features-restconf</module>
+        <module>odl-restconf-all</module>
         <module>odl-mdsal-apidocs</module>
         <module>odl-restconf</module>
-        <module>odl-restconf-base</module>
-        <module>odl-restconf-all</module>
-        <module>odl-restconf-common</module>
         <module>odl-restconf-noauth</module>
+        <module>odl-restconf-common</module>
+        <module>odl-restconf-nb-bierman02-base</module>
         <module>odl-restconf-nb-rfc8040</module>
         <module>odl-restconf-nb-rfc8040-all</module>
     </modules>