Bug 1948: Finish separating out restconf features

[controller.git] / features / restconf / src / main / resources / features.xml

diff --git a/features/restconf/src/main/resources/features.xml b/features/restconf/src/main/resources/features.xml
index 4d17b48cadece860c8f25364c49e8bc4cad93b22..f0c649a7538239d8d73e69dd91c99f38b0eb6502 100644 (file)
--- a/features/restconf/src/main/resources/features.xml
+++ b/features/restconf/src/main/resources/features.xml
@@ -36,9 +36,9 @@
             <feature version='${project.version}'>odl-controller-provider</feature>
             <feature version='${project.version}'>odl-controller-model</feature>
         -->
             <feature version='${project.version}'>odl-controller-provider</feature>
             <feature version='${project.version}'>odl-controller-model</feature>
         -->

-        <feature version='${project.version}'>odl-restconf-new</feature>
-        <feature version='${project.version}'>odl-mdsal-apidocs-new</feature>
-        <feature version='${project.version}'>odl-clustering-test-app-new</feature>
+        <feature version='${project.version}'>odl-restconf</feature>
+        <feature version='${project.version}'>odl-mdsal-apidocs</feature>
+        <feature version='${project.version}'>odl-clustering-test-app</feature>

     </feature>
     <!--
         Necessary TODO: Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.
     </feature>
     <!--
         Necessary TODO: Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.


@@ -85,9 +85,12 @@
 
     -->
 
 
     -->
 

-    <feature name='odl-restconf-new' version='${project.version}' description="OpenDaylight :: Restconf">
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature name='odl-restconf' version='${project.version}' description="OpenDaylight :: Restconf">

         <feature version='${aaa.version}'>odl-aaa-authn</feature>
         <feature version='${aaa.version}'>odl-aaa-authn</feature>

+        <feature version='${mdsal.version}'>odl-restconf-noauth</feature>
+    </feature>
+    <feature name='odl-restconf-noauth' version='${project.version}' description="OpenDaylight :: Restconf">
+        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>

         <feature>war</feature>
         <!-- presently we need sal-remote to be listed BEFORE sal-rest-connector because sal-rest-connector
              has a yang file which augments a yang file in sal-remote, and order seems to matter -->
         <feature>war</feature>
         <!-- presently we need sal-remote to be listed BEFORE sal-rest-connector because sal-rest-connector
              has a yang file which augments a yang file in sal-remote, and order seems to matter -->


@@ -106,8 +109,8 @@
         <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.restconf.configfile}">mvn:org.opendaylight.controller/sal-rest-connector-config/${mdsal.version}/xml/config</configfile>
     </feature>
         <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.restconf.configfile}">mvn:org.opendaylight.controller/sal-rest-connector-config/${mdsal.version}/xml/config</configfile>
     </feature>

-    <feature name ='odl-mdsal-apidocs-new' version='${project.version}' description="OpenDaylight :: MDSAL :: APIDOCS">
-        <feature version='${project.version}'>odl-restconf-new</feature>
+    <feature name ='odl-mdsal-apidocs' version='${project.version}' description="OpenDaylight :: MDSAL :: APIDOCS">
+        <feature version='${project.version}'>odl-restconf</feature>

         <bundle>mvn:org.opendaylight.controller/sal-rest-docgen/${project.version}</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-rest-docgen/${project.version}</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>


@@ -122,9 +125,9 @@
         <bundle>wrap:mvn:org.json/json/${org.json.version}</bundle>
     </feature>
 
         <bundle>wrap:mvn:org.json/json/${org.json.version}</bundle>
     </feature>
 

-    <feature name='odl-clustering-test-app-new' version='${project.version}'>
+    <feature name='odl-clustering-test-app' version='${project.version}'>

         <feature version='${project.version}'>odl-mdsal-clustering</feature>
         <feature version='${project.version}'>odl-mdsal-clustering</feature>

-        <feature version='${project.version}'>odl-restconf-new</feature>
+        <feature version='${project.version}'>odl-restconf</feature>

         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
         <bundle>mvn:org.opendaylight.controller.samples/clustering-it-model/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller.samples/clustering-it-provider/${project.version}</bundle>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
         <bundle>mvn:org.opendaylight.controller.samples/clustering-it-model/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller.samples/clustering-it-provider/${project.version}</bundle>


@@ -134,7 +137,7 @@
     </feature>
 
     <feature name='odl-toaster-rest' version='${project.version}'>
     </feature>
 
     <feature name='odl-toaster-rest' version='${project.version}'>

-        <feature version='${project.version}'>odl-restconf-new</feature>
+        <feature version='${project.version}'>odl-restconf</feature>

         <feature version='${project.version}'>odl-toaster</feature>
     </feature>
 
         <feature version='${project.version}'>odl-toaster</feature>
     </feature>