Add packetcable-driver as a bundle and fix karafe depends. Merge hop-along model...

[packetcable.git] / features-packetcable / src / main / resources / features.xml

diff --git a/features-packetcable/src/main/resources/features.xml b/features-packetcable/src/main/resources/features.xml
index cecfeaf67be50fafab86f5af989631170325fbe9..b9b9980e459643c2539b0e5110ea4601136f8087 100644 (file)
--- a/features-packetcable/src/main/resources/features.xml
+++ b/features-packetcable/src/main/resources/features.xml
@@ -27,6 +27,7 @@
             <feature version='${project.version}'>odl-packetcable-consumer</feature>
             <feature version='${project.version}'>odl-packetcable-provider</feature>
             <feature version='${project.version}'>odl-packetcable-model</feature>
+            <feature version='${project.version}'>odl-packetcable-driver</feature>
     </feature>
     <!--
         Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.
@@ -40,15 +41,14 @@
             <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
             <feature version='${project.version}'>odl-packetcable-model</feature>
             <feature version='${project.version}'>odl-packetcable-provider</feature>
-            <bundle>mvn:org.opendaylight.controller.packetcable/packetcable-consumer/${project.version}</bundle>
+            <feature version='${project.version}'>odl-packetcable-driver</feature>
         </feature>
 
         <!--- * Basic MD-SAL Model feature -->
         <feature name='odl-packetcable-model' version='${project.version}' description='OpenDaylight :: packetcable :: Model'>
             <feature version='0.6.2-SNAPSHOT'>odl-yangtools-binding</feature>
             <feature version='0.6.2-SNAPSHOT'>odl-yangtools-models</feature>
-            <!--feature version='0.0.3-SNAPSHOT'>odl-openflowplugin-flow-services</feature-->
-<feature version='${project.version}'>odl-flow-model</feature>
+           <feature version='${project.version}'>odl-flow-model</feature>
             <bundle>mvn:org.opendaylight.controller.packetcable/packetcable-model/${project.version}</bundle>
         </feature>
 
@@ -56,9 +56,15 @@
         <feature name='odl-packetcable-provider' version='${project.version}' description='OpenDaylight :: packetcable :: Provider'>
             <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
             <bundle>mvn:org.opendaylight.controller.packetcable/packetcable-provider/${project.version}</bundle>
-            <!--feature version='0.0.3-SNAPSHOT'>odl-openflowplugin-flow-services</feature-->
-<feature version='${project.version}'>odl-flow-model</feature>
+            <bundle>mvn:org.opendaylight.controller.packetcable/packetcable-driver/${project.version}</bundle>
+           <feature version='${project.version}'>odl-flow-model</feature>
             <feature version='${project.version}'>odl-packetcable-model</feature>
+            <feature version='${project.version}'>odl-packetcable-driver</feature>
         </feature>
 
+        <!--- * * -->
+        <feature name='odl-packetcable-driver' version='${project.version}' description='OpenDaylight :: packetcable :: Driver'>
+            <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
+       </feature>
+
 </features>