From 502f55b4473e2a9b5a751b072bda483d54f8b8f3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 9 Jan 2019 13:35:25 +0100
Subject: [PATCH] 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>
---
 .../pom.xml                                                 | 4 ++--
 features/restconf/odl-restconf-nb-rfc8040/pom.xml           | 2 +-
 features/restconf/odl-restconf-noauth/pom.xml               | 4 ++--
 features/restconf/odl-restconf/pom.xml                      | 2 +-
 features/restconf/pom.xml                                   | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename features/restconf/{odl-restconf-base => odl-restconf-nb-bierman02-base}/pom.xml (95%)

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 ba6fbcbaef..80b8c5b5d8 100644
--- 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 a82d7e0dca..ab6908ea21 100644
--- 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 067a9d22ee..15cc9bac3f 100644
--- 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 77d27231c3..dbf08b4a83 100644
--- 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 8105b7792c..37e6a290d9 100644
--- 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>
-- 
2.36.6