Fix order of base feature loading.

The order of the features in the features.xml file is
important -- this patch fixes the order so that the
ofoverlay feature comes up correctly.

Change-Id: Idf7c5e9ce7c026a67f7dd3c913f35abcea979119
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 6f1122a60765d7c7263934ced2adda08dd398334..f80b929c2629020d0751f22c4fa1938c91d3ca20 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -40,12 +40,9 @@
         Network Virtualization behavior using OpenFlow
     -->
     <feature name='odl-groupbasedpolicy-ofoverlay' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: OpenFlow Overlay Renderer'>
-        <!--
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        -->
         <feature version="${openflowplugin.distribution.version}">odl-openflowplugin-flow-services</feature>
         <feature version='${openflowplugin.distribution.version}'>odl-openflowplugin-nxm-extensions</feature>
-        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.ofoverlayconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/${project.version}/xml/config</configfile>
     </feature>
@@ -57,9 +54,6 @@
         OpFlex renderer in the controller
     -->
     <feature name='odl-groupbasedpolicy-opflex' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: OpFlex Renderer'>
-        <!--
-        <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
-        -->
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/opflex-renderer/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.opflexconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-opflex-config/${project.version}/xml/config</configfile>