commit ab25a716ae01892766038025bd0c5b3cb06495b7
author Henry Yu <henry.yu1@huawei.com> Sat Feb 18 13:15:25 2017 -0500
committer Henry Yu <henry.yu1@huawei.com> Tue Feb 28 11:03:08 2017 -0500
tree dbf5572362905c3ff23446680a91ce6aba108c51
parent 33917d353d7fc8d55fd0a87ffa667a291fe98317

[ONOS-5756] RESTCONF protocol support for RESTCONF App

* Created a config flag in RESTCONF protocol, to allow the protocol
  to be dynamically configured to work with either YMS or Dynamic Config
  during runtime.

* Note that this is an interim solution to help RESTCONF migrate from
  YMS to Dynamic Config. The changes will be removed once the migration
  is complete.

Change-Id: I36dc8537c88965034da6238df32dde7558ac5f5c

apps/restconf/app/app.xml

diff --git a/apps/restconf/app/app.xml b/apps/restconf/app/app.xml
index d5f0ecd..187f12c 100644
--- a/apps/restconf/app/app.xml
+++ b/apps/restconf/app/app.xml
@@ -19,6 +19,6 @@
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" >
     <description>${project.description}</description>
-    <artifact>mvn:${project.groupId}/onos-restconf-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-restconf-restconfmanager/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-app-restconf-api/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-app-restconf-restconfmanager/${project.version}</artifact>
 </app>

apps/restconf/app/features.xml

diff --git a/apps/restconf/app/features.xml b/apps/restconf/app/features.xml
index 1cbad5a..43dd645 100644
--- a/apps/restconf/app/features.xml
+++ b/apps/restconf/app/features.xml
@@ -18,7 +18,7 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
-        <bundle>mvn:${project.groupId}/onos-restconf-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-restconf-restconfmanager/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-restconf-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-restconf-restconfmanager/${project.version}</bundle>
     </feature>
 </features>

apps/restconf/app/pom.xml

diff --git a/apps/restconf/app/pom.xml b/apps/restconf/app/pom.xml
index 6f5228e..88257ec 100644
--- a/apps/restconf/app/pom.xml
+++ b/apps/restconf/app/pom.xml
@@ -21,12 +21,12 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-restconf</artifactId>
+        <artifactId>onos-restconf-parent</artifactId>
         <version>1.10.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>onos-restconf-app</artifactId>
+    <artifactId>onos-app-restconf</artifactId>
     <packaging>pom</packaging>
 
     <properties>
@@ -38,12 +38,12 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-restconf-api</artifactId>
+            <artifactId>onos-app-restconf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-restconf-restconfmanager</artifactId>
+            <artifactId>onos-app-restconf-restconfmanager</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>