From 39a9486c68075139f0034c2dd94c8cca0f3805a9 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 18 Sep 2014 17:11:12 -0500
Subject: [PATCH] Bug 1962: add convenience -rest and -ui features

Change-Id: I2f619f322abfb2de069fbcba9fb2751fb924bd00
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 features/pom.xml                         |  7 +++++++
 features/src/main/resources/features.xml | 13 +++++++++++++
 pom.xml                                  |  1 +
 3 files changed, 21 insertions(+)

diff --git a/features/pom.xml b/features/pom.xml
index 6b434f7662..aca86e2a7f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -40,6 +40,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <version>${dlux.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- bundle dependencies -->
     <dependency>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 4addaa5739..a4f6bb9138 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -6,10 +6,13 @@
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
 
     <feature name='odl-openflowplugin-all' description="OpenDaylight :: Openflow Plugin :: All" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <feature version="${project.version}">odl-openflowplugin-flow-services</feature>
+        <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
+        <feature version="${project.version}">odl-openflowplugin-flow-services-ui</feature>
     </feature>
     <feature name='odl-openflowplugin-southbound' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
@@ -25,6 +28,16 @@
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
         <feature version="${mdsal.version}">odl-flow-services</feature>
     </feature>
+    <feature name='odl-openflowplugin-flow-services-rest' description="OpenDaylight :: Openflow Plugin :: Flow Services :: REST" version='${project.version}'>
+        <feature version="${project.version}">odl-openflowplugin-flow-services</feature>
+        <feature version="${mdsal.version}">odl-restconf</feature>
+    </feature>
+    <feature name='odl-openflowplugin-flow-services-ui' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
+        <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
+        <feature version="${dlux.version}">odl-dlux-core</feature>
+        <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
+        <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
+    </feature>
     <feature name='odl-openflowplugin-drop-test' description="OpenDaylight :: Openflow Plugin :: Drop Test" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services</feature>
         <bundle>mvn:org.opendaylight.openflowplugin/test-common/${project.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 7b3e34105d..3c649f7913 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
 
       <karaf.distro.empty.version>1.4.2-SNAPSHOT</karaf.distro.empty.version>
       <yang.binding.version>0.6.2-SNAPSHOT</yang.binding.version>
+      <dlux.version>0.1.0-SNAPSHOT</dlux.version>
     </properties>
 
     <dependencyManagement>
-- 
2.36.6