Changed feature names of the VTN Manager.

According to the feature naming wiki, this patch changed feature names
of VTN Manager.
https://wiki.opendaylight.org/view/CrossProject:Integration_Group:About_User_Facing_Features

Change-Id: I6fa54e91527bbef55280c7904191da337d0b1559
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>

diff --git a/manager/dist/karaf/pom.xml b/manager/dist/karaf/pom.xml
index 529b949b8ceea62c655948c37a6049008f98acdb..d488efc914fe8926f18a203c92688d21ef75967e 100644 (file)
--- a/manager/dist/karaf/pom.xml
+++ b/manager/dist/karaf/pom.xml
@@ -178,7 +178,8 @@
           <!-- no startupFeatures -->
           <bootFeatures>
             <feature>standard</feature>
-            <feature>odl-vtn-manager-all</feature>
+            <feature>odl-vtn-manager-rest</feature>
+            <feature>odl-vtn-manager-neutron</feature>
           </bootFeatures>
           <!-- no installedFeatures -->
         </configuration>

diff --git a/manager/features/src/main/resources/features.xml b/manager/features/src/main/resources/features.xml
index 89e77a3f59a69b073ae70b00f4c7cd2f1e3ea49f..ca65c2667258e9f2a9bcbf5c87acf4609268eca7 100644 (file)
--- a/manager/features/src/main/resources/features.xml
+++ b/manager/features/src/main/resources/features.xml
@@ -23,21 +23,23 @@
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.openflowplugin.legacy/features-legacy/${feature.openflowplugin.version}/xml/features</repository>
 
+  <!-- TODO: Delete this feature after it is removed from other projects. -->
   <feature
       name='odl-vtn-manager-all'
       description="OpenDaylight VTN Manager All"
       version='${project.version}'>
-    <feature version="${project.version}">odl-vtn-manager-runtime</feature>
-    <feature version="${project.version}">odl-vtn-manager-java-api</feature>
-    <feature version="${project.version}">odl-vtn-manager-northbound</feature>
+    <feature version="${project.version}">odl-vtn-manager</feature>
+    <feature version="${project.version}">odl-vtn-manager-rest</feature>
     <feature version="${project.version}">odl-vtn-manager-neutron</feature>
   </feature>
 
   <feature
-      name='odl-vtn-manager-java-api'
+      name='odl-vtn-manager'
       description="OpenDaylight :: VTN Manager :: Java API"
       version='${project.version}'>
     <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+    <feature version="${feature.openflowplugin.version}">odl-openflowplugin-adsal-compatibility-all</feature>
+    <feature version="${feature.openflowplugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version="${feature.openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${feature.neutron.version}">odl-neutron-service</feature>
     <feature version="${feature.nsf.version}">odl-nsf-service</feature>
@@ -48,11 +50,11 @@
   </feature>
 
   <feature
-      name='odl-vtn-manager-northbound'
-      description="OpenDaylight :: VTN Manager :: Northbound"
+      name='odl-vtn-manager-rest'
+      description="OpenDaylight :: VTN Manager :: REST API"
       version='${project.version}'>
     <feature version='${feature.neutron.version}'>odl-neutron-northbound-api</feature>
-    <feature version="${project.version}">odl-vtn-manager-java-api</feature>
+    <feature version="${project.version}">odl-vtn-manager</feature>
     <feature version="${odl.mdsal.version}">odl-restconf</feature>
     <bundle>mvn:org.opendaylight.vtn/manager.northbound/${project.version}</bundle>
   </feature>
@@ -65,15 +67,7 @@
     <feature version='${feature.neutron.version}'>odl-neutron-transcriber</feature>
     <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
     <feature version='${feature.ovsdb.version}'>odl-ovsdb-compatibility-layer</feature>
-    <feature version="${project.version}">odl-vtn-manager-java-api</feature>
+    <feature version="${project.version}">odl-vtn-manager</feature>
     <bundle>mvn:org.opendaylight.vtn/manager.neutron/${project.version}</bundle>
   </feature>
-
-  <feature
-      name='odl-vtn-manager-runtime'
-      description="OpenDaylight :: VTN Manager :: Runtime Dependencies"
-      version='${project.version}'>
-    <feature version="${feature.openflowplugin.version}">odl-openflowplugin-adsal-compatibility-all</feature>
-    <feature version="${feature.openflowplugin.version}">odl-openflowplugin-flow-services</feature>
-  </feature>
 </features>