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 d8cd0da403871335ed9447a4194c51fbea28e21f..2dd2d684ecfd0bdb01223475347f2d9379c83c89 100644 (file)
--- 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 3fe7a40ff3aa8f62526e8666c69821e1bb4c0b62..e41d064fb791e41219e919e6891813f1f5859174 100644 (file)
--- 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 2d4d3ccd0c2fabf226eb743ccfee57fa33984ae3..2ce799ae75f0cdd3e9c230dc54c200e026a01bf6 100644 (file)
--- 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 072e8a03c6303c07957ccc78b7b24d54195298f1..71cbff0af56d80694a2d77ae3e7eea0a1831a2d8 100644 (file)
--- 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 da904a9017ce7d666280aee24acf1edc75c10a2b..ee82f67fc086c1374ccae959c574288554b8ae98 100644 (file)
--- 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 44a92fe64f135c542d9db1fa89e215b760d5fd37..5aef0ba16846634ad78f4bb01f602a97e6088dbc 100644 (file)
--- 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 0b59e925a797106a65470f1207f7a9057d11c738..57aca12f02245175b02d414b49feef1f85627540 100644 (file)
--- 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 cf17427554ff19f0f534666f1ef96ecd62074ad8..935c0091e5f4e56ab1ffe6433c482fa40f7e1798 100644 (file)
--- 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 b2fae3a58949f0b7a3e79e924a9a072757b2c961..3f55a2b41ce7b209d86d463f53e86b5f88f01b05 100644 (file)
--- 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 4d59732fd534a2e72a488248def96e8ce285c017..62428fc6128b023012507579d01432e211a68d82 100644 (file)
--- 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 8299c407a4bc92086591ff6678748aab2e6014e9..43c8ccac918e0433c7ef8bf8cde96208bcd44dd3 100644 (file)
--- 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 d0979df307d58e2fec284c6aeae2cabb901bb56e..528c46600d6dd2300d551ec03a3908b015224399 100644 (file)
--- 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 0a45a03a9ed537b9b3394145fd72f46ae8c82bc8..3303c90ed51fcd880ef44c4f0183d85424d73268 100644 (file)
--- 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 1598220aad4fc1f175fd416d518cb8997e97cb69..11de1c6779e35ba97185da1a29f2a11fb5f4eb56 100644 (file)
--- 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>