From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 16 Jul 2024 15:51:17 +0000 (+0200)
Subject: Rename *rfc8040 to *rfc8040-ietf-restconf
X-Git-Tag: v14.0.0~16
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3be16a79a57968ab4a0d6dded9df26c3b60da060;p=mdsal.git

Rename *rfc8040 to *rfc8040-ietf-restconf

We are now packaging two models which are completely independent. Keep
them as two features, following such model packaging guidelines.

Change-Id: I89f2172b25935db65585468e6d55f05db43b5575
JIRA: MDSAL-862
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index d8cd0da403..2dd2d684ec 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -450,7 +450,7 @@
             <!-- RFC8040 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8040</artifactId>
+                <artifactId>rfc8040-ietf-restconf</artifactId>
                 <version>14.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -785,7 +785,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-rfc8040</artifactId>
+                <artifactId>odl-mdsal-model-rfc8040-ietf-restconf</artifactId>
                 <version>14.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
diff --git a/binding/mdsal-binding-test-model/pom.xml b/binding/mdsal-binding-test-model/pom.xml
index 3fe7a40ff3..e41d064fb7 100644
--- a/binding/mdsal-binding-test-model/pom.xml
+++ b/binding/mdsal-binding-test-model/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8040</artifactId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
diff --git a/docs/pom.xml b/docs/pom.xml
index 2d4d3ccd0c..2ce799ae75 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -172,7 +172,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8040</artifactId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/features/odl-mdsal-model-rfc8040/pom.xml b/features/odl-mdsal-model-rfc8040-ietf-restconf/pom.xml
similarity index 83%
rename from features/odl-mdsal-model-rfc8040/pom.xml
rename to features/odl-mdsal-model-rfc8040-ietf-restconf/pom.xml
index 072e8a03c6..71cbff0af5 100644
--- a/features/odl-mdsal-model-rfc8040/pom.xml
+++ b/features/odl-mdsal-model-rfc8040-ietf-restconf/pom.xml
@@ -16,11 +16,11 @@
     </parent>
 
     <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>odl-mdsal-model-rfc8040</artifactId>
+    <artifactId>odl-mdsal-model-rfc8040-ietf-restconf</artifactId>
     <version>14.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-    <name>OpenDaylight :: MD-SAL :: Model :: RFC8040</name>
-    <description>Models from RFC8040</description>
+    <name>OpenDaylight :: MD-SAL :: Model :: RFC8040 ietf-restconf</name>
+    <description>ietf-restconf module from RFC8040</description>
 
     <dependencies>
         <dependency>
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8040</artifactId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-mdsal-model-rfc8040/src/main/feature/feature.xml b/features/odl-mdsal-model-rfc8040-ietf-restconf/src/main/feature/feature.xml
similarity index 67%
rename from features/odl-mdsal-model-rfc8040/src/main/feature/feature.xml
rename to features/odl-mdsal-model-rfc8040-ietf-restconf/src/main/feature/feature.xml
index da904a9017..ee82f67fc0 100644
--- a/features/odl-mdsal-model-rfc8040/src/main/feature/feature.xml
+++ b/features/odl-mdsal-model-rfc8040-ietf-restconf/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-binding-base">
-    <feature name="odl-mdsal-model-rfc8040">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-mdsal-model-rfc8040-ietf-restconf">
+    <feature name="odl-mdsal-model-rfc8040-ietf-restconf">
         <feature version="[14,15)">odl-yangtools-binding-spec</feature>
     </feature>
 </features>
diff --git a/features/odl-mdsal-model-rfc8072/pom.xml b/features/odl-mdsal-model-rfc8072/pom.xml
index 44a92fe64f..5aef0ba168 100644
--- a/features/odl-mdsal-model-rfc8072/pom.xml
+++ b/features/odl-mdsal-model-rfc8072/pom.xml
@@ -25,7 +25,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc8040</artifactId>
+            <artifactId>odl-mdsal-model-rfc8040-ietf-restconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
diff --git a/features/odl-mdsal-model-rfc8639/pom.xml b/features/odl-mdsal-model-rfc8639/pom.xml
index 0b59e925a7..57aca12f02 100644
--- a/features/odl-mdsal-model-rfc8639/pom.xml
+++ b/features/odl-mdsal-model-rfc8639/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc8040</artifactId>
+            <artifactId>odl-mdsal-model-rfc8040-ietf-restconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
diff --git a/features/pom.xml b/features/pom.xml
index cf17427554..935c0091e5 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -77,7 +77,7 @@
         <module>odl-mdsal-model-rfc7317-iana-crypt-hash</module>
         <module>odl-mdsal-model-rfc7407-ietf-x509-cert-to-name</module>
         <module>odl-mdsal-model-rfc7952</module>
-        <module>odl-mdsal-model-rfc8040</module>
+        <module>odl-mdsal-model-rfc8040-ietf-restconf</module>
         <module>odl-mdsal-model-rfc8040-ietf-restconf-monitoring</module>
         <module>odl-mdsal-model-rfc8072</module>
         <module>odl-mdsal-model-rfc8294</module>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index b2fae3a589..3f55a2b41c 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -119,7 +119,7 @@
     </dependency>
     <dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>odl-mdsal-model-rfc8040</artifactId>
+        <artifactId>odl-mdsal-model-rfc8040-ietf-restconf</artifactId>
         <classifier>features</classifier>
         <type>xml</type>
     </dependency>
diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 4d59732fd5..62428fc612 100644
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -49,8 +49,7 @@
         <module>rfc7407-ietf-x509-cert-to-name</module>
 
         <!-- RFC8040 RESTCONF -->
-        <!-- FIXME: rename to rfc8040-ietf-restconf -->
-        <module>rfc8040</module>
+        <module>rfc8040-ietf-restconf</module>
         <module>rfc8040-ietf-restconf-monitoring</module>
 
         <!-- RFC8072 YANG Patch -->
diff --git a/model/ietf/rfc8040/pom.xml b/model/ietf/rfc8040-ietf-restconf/pom.xml
similarity index 95%
rename from model/ietf/rfc8040/pom.xml
rename to model/ietf/rfc8040-ietf-restconf/pom.xml
index 8299c407a4..43c8ccac91 100644
--- a/model/ietf/rfc8040/pom.xml
+++ b/model/ietf/rfc8040-ietf-restconf/pom.xml
@@ -17,12 +17,12 @@
     </parent>
 
     <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-    <artifactId>rfc8040</artifactId>
+    <artifactId>rfc8040-ietf-restconf</artifactId>
     <version>14.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>${project.artifactId}</name>
-    <description>RFC8040 RESTCONF Protocol</description>
+    <description>RFC8040 ietf-restconf</description>
 
     <dependencies>
         <dependency>
diff --git a/model/ietf/rfc8040/src/main/yang/ietf-restconf@2017-01-26.yang b/model/ietf/rfc8040-ietf-restconf/src/main/yang/ietf-restconf@2017-01-26.yang
similarity index 100%
rename from model/ietf/rfc8040/src/main/yang/ietf-restconf@2017-01-26.yang
rename to model/ietf/rfc8040-ietf-restconf/src/main/yang/ietf-restconf@2017-01-26.yang
diff --git a/model/ietf/rfc8072/pom.xml b/model/ietf/rfc8072/pom.xml
index d0979df307..528c46600d 100644
--- a/model/ietf/rfc8072/pom.xml
+++ b/model/ietf/rfc8072/pom.xml
@@ -27,7 +27,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8040</artifactId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/model/ietf/rfc8639/pom.xml b/model/ietf/rfc8639/pom.xml
index 0a45a03a9e..3303c90ed5 100644
--- a/model/ietf/rfc8639/pom.xml
+++ b/model/ietf/rfc8639/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8040</artifactId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/model/ietf/rfc8641/pom.xml b/model/ietf/rfc8641/pom.xml
index 1598220aad..11de1c6779 100644
--- a/model/ietf/rfc8641/pom.xml
+++ b/model/ietf/rfc8641/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc8040</artifactId>
+            <artifactId>rfc8040-ietf-restconf</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>