Replace odl-dlux-core with odl-dluxapps-topology

[l2switch.git] / features / src / main / features / features.xml

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 4bed47affee8c0982c199a98cc9d6fc03e86e3e4..31255a322998527040d15787f51062ab5f22bd6d 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -3,56 +3,51 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
   <feature name='odl-l2switch-all' description="OpenDaylight :: L2Switch :: All" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch</feature>
   </feature>
   <feature name='odl-l2switch-switch' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-hosttracker</feature>
+    <feature version="${project.version}">odl-l2switch-arphandler</feature>
     <bundle>mvn:org.opendaylight.l2switch.main/main-impl/{{VERSION}}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.l2switchmain.configfile}">mvn:org.opendaylight.l2switch.main/main-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-switch-rest' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch</feature>
-    <feature version="${mdsal.version}">odl-restconf</feature>
+    <feature version="${restconf.version}">odl-restconf</feature>
   </feature>
   <feature name='odl-l2switch-switch-ui' description="OpenDaylight :: L2Switch :: Switch" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch-rest</feature>
-    <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
+    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
     <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
-    <feature version="${dlux.version}">odl-dlux-core</feature>
+    <feature version="${dluxapps.version}">odl-dluxapps-topology</feature>
   </feature>
   <feature name='odl-l2switch-hosttracker' description="OpenDaylight :: L2Switch :: HostTracker" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-addresstracker</feature>
     <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-model/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.l2switch.hosttracker/hosttracker-impl/{{VERSION}}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.hosttracker.configfile}">mvn:org.opendaylight.l2switch.hosttracker/hosttracker-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-addresstracker' description="OpenDaylight :: L2Switch :: AddressTracker" version='${project.version}'>
-    <feature version="${project.version}">odl-l2switch-arphandler</feature>
+    <feature version="${project.version}">odl-l2switch-packethandler</feature>
     <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-impl/{{VERSION}}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.addresstracker.configfile}">mvn:org.opendaylight.l2switch.addresstracker/addresstracker-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-arphandler' description="OpenDaylight :: L2Switch :: ArpHandler" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-packethandler</feature>
     <feature version="${project.version}">odl-l2switch-loopremover</feature>
     <bundle>mvn:org.opendaylight.l2switch.addresstracker/addresstracker-model/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.l2switch.arphandler/arphandler-impl/{{VERSION}}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.arphandler.configfile}">mvn:org.opendaylight.l2switch.arphandler/arphandler-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-loopremover' description="OpenDaylight :: L2Switch :: LoopRemover" version='${project.version}'>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-flow-services</feature>
     <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-model/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.l2switch.loopremover/loopremover-impl/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.controller.thirdparty/net.sf.jung2/2.0.1</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.loopremover.configfile}">mvn:org.opendaylight.l2switch.loopremover/loopremover-config/{{VERSION}}/xml/config</configfile>
   </feature>
   <feature name='odl-l2switch-packethandler' description="OpenDaylight :: L2Switch :: PacketHandler" version='${project.version}'>
     <feature version="${openflow.plugin.version}">odl-openflowplugin-southbound</feature>
     <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-model/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.l2switch.packethandler/packethandler-impl/{{VERSION}}</bundle>
-    <configfile finalname="${config.configfile.directory}/${config.packethandler.configfile}">mvn:org.opendaylight.l2switch.packethandler/packethandler-config/{{VERSION}}/xml/config</configfile>
   </feature>
 </features>