git reRevert "features cleanup for Li proposal implementation"

This reverts commit 7105851746e6d21f917b4b15cf638540c8056606.

Signed-off-by: Ed Warnicke <hagbard@gmail.com>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 6d79fd4d5224a8a33bd0d52f2ca8e99cdc3faa9e..1c9d2d326c24d2469b966c58c014b4dc333b3805 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -17,7 +17,7 @@
         <feature version="${project.version}">odl-openflowplugin-flow-services-ui</feature>
     </feature>
 
-    <feature name='odl-openflowplugin-He-southbound' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
+    <feature name='odl-openflowplugin-southbound' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
         <feature version="${project.version}">odl-openflowplugin-nsf-model</feature>
         <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
@@ -25,16 +25,17 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/liblldp/${sal.api.version}</bundle>
-        <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-He.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/43-msg-spy.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/configmsgspy</configfile>
-        <configfile finalname="${config.configfile.directory}/${config.statistics.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/statistics-manager-config/${project.version}/xml/config</configfile>
     </feature>
 
-    <feature name='odl-openflowplugin-southbound' description="OpenDaylight :: Openflow Plugin :: Li southBound API implementation " version='${project.version}'>
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+    <feature name='odl-openflowplugin-new-southbound' description="OpenDaylight :: Openflow Plugin :: New southBound API implementation - right now for testing purpose only" version='${project.version}'>
+        <!-- TODO : next two features should be extracted to separate feature tags, it is assembled this way only for testing of new-southbound during devel -->
         <feature version="${project.version}">odl-openflowplugin-nsf-services</feature>
+        <feature version="${mdsal.version}">odl-restconf</feature>
+
+        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+        <feature version="${project.version}">odl-openflowplugin-nsf-model</feature>
         <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
         <!-- TODO : remove dependency on openflowplugin in the future -->
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin/${project.version}</bundle>
@@ -42,7 +43,7 @@
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/liblldp/${sal.api.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-Li.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/ofplugin-config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-new.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/${project.version}/xml/ofplugin-config</configfile>
     </feature>
 
     <feature name='odl-openflowplugin-flow-services' description="OpenDaylight :: Openflow Plugin :: Flow Services" version='${project.version}'>
@@ -58,8 +59,11 @@
         <feature version='${project.version}'>odl-openflowplugin-nsf-model</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/topology-manager/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/topology-lldp-discovery/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/statistics-manager/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin.applications/inventory-manager/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/forwardingrules-manager/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.controller/liblldp/${sal.api.version}</bundle>
+        <configfile finalname="${config.configfile.directory}/${config.statistics.manager.configfile}">mvn:org.opendaylight.openflowplugin.applications/statistics-manager-config/${project.version}/xml/config</configfile>
     </feature>
 
     <feature name='odl-openflowplugin-nsf-model' version='${project.version}'
@@ -110,8 +114,8 @@
         <bundle>mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/71-lldp-speaker.xml">mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}/xml/config</configfile>
     </feature>
-    <feature name='odl-openflowplugin-app-He-lldp-speaker' description="OpenDaylight :: Openflow Plugin :: app lldp-speaker" version='${project.version}'>
-        <feature version="${project.version}">odl-openflowplugin-He-southbound</feature>
+    <feature name='odl-openflowplugin-app-new-lldp-speaker' description="OpenDaylight :: Openflow Plugin :: app lldp-speaker" version='${project.version}'>
+        <feature version="${project.version}">odl-openflowplugin-new-southbound</feature>
         <bundle>mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/71-lldp-speaker.xml">mvn:org.opendaylight.openflowplugin.applications/lldp-speaker/${project.version}/xml/config</configfile>
     </feature>

diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index d2f29d8a1d980698b56385740aaeff2a436a8c16..81cc3bcad5daee63f568e7764ce655fba002dc85 100644 (file)
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -35,7 +35,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>${project.build.directory}/classes/initial/42-openflowplugin-He.xml</file>
+                                    <file>${project.build.directory}/classes/initial/42-openflowplugin.xml</file>
                                     <type>xml</type>
                                     <classifier>config</classifier>
                                 </artifact>
@@ -51,7 +51,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>${project.build.directory}/classes/initial/42-openflowplugin-Li.xml</file>
+                                    <file>${project.build.directory}/classes/initial/42-openflowplugin-new.xml</file>
                                     <type>xml</type>
                                     <classifier>ofplugin-config</classifier>
                                 </artifact>

diff --git a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-Li.xml b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml
similarity index 100%
rename from openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-Li.xml
rename to openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml

diff --git a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-He.xml b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml
similarity index 100%
rename from openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-He.xml
rename to openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml