Replace dlux with dluxapps features

Renaming is due to DLUX project split.
Also, replacing yangui feature with yangman, new, redesigned and restyled
application.

https://wiki.opendaylight.org/view/Weather#Rename_some_odl-dlux-.2A_features_to_odl-dluxapps-.2A

Change-Id: I6db17bfb6fe97d0123d5f7f39106eae7332751af
Signed-off-by: Daniel Malachovsky <dmalacho@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index e9e4fafd8962c1305ef0afd8c7d68ba85726ef5c..7bb0ae055aa76557565e38b0e4cadd3e0c9b48c3 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved. 
-  This program and the accompanying materials are made available under the 
-  terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+<!-- Copyright (c) 2015 Cable Television Laboratories, Inc. All rights reserved.
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -24,6 +24,7 @@
     <restconf.version>1.5.0-SNAPSHOT</restconf.version>
     <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     <dlux.version>0.5.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
     <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
     <netvirt.version>1.4.0-SNAPSHOT</netvirt.version>
     <vpnservice.version>0.4.0-SNAPSHOT</vpnservice.version>
@@ -109,6 +110,14 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.dluxapps</groupId>
+      <artifactId>features-dluxapps</artifactId>
+      <classifier>features</classifier>
+      <version>${dluxapps.version}</version>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>southbound-features</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 7c523b56bd7179ea2fcc57eecc2e6b69fc93b80b..1d1015e601e342a9adcb757f9fd919e4eb6fd143 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright (c) 2015 CableLabs This program and the accompanying materials 
-  are made available under the terms of the Eclipse Public License v1.0 which 
+<!-- Copyright (c) 2015 CableLabs This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0 which
   accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html -->
 <features name="odl-unimgr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,6 +11,7 @@
   <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.netconf/features-netconf/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.genius/genius-features/{{VERSION}}/xml/features</repository>
@@ -36,7 +37,7 @@
     <feature version='${ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
     <feature version='${project.version}'>odl-unimgr-api</feature>
     <feature version='${project.version}'>odl-unimgr-presto-api</feature>
-    <!-- TODO these features should be dependencies of drivers not unimgr 
+    <!-- TODO these features should be dependencies of drivers not unimgr
       itself -->
     <feature version='${netconf.version}'>odl-netconf-connector</feature>
     <feature version='${netconf.version}'>odl-netconf-connector-ssh</feature>
@@ -62,7 +63,7 @@
         <feature version='${dlux.version}'>odl-dlux-core</feature>
         <bundle>mvn:org.opendaylight.unimgr/cpeui-bundle/{{VERSION}}</bundle>
     </feature>
-    
+
 
   <feature name='odl-unimgr-console' version='${project.version}'
     description='OpenDaylight :: UniMgr :: CLI'>
@@ -82,7 +83,7 @@
     <feature version="${project.version}">odl-unimgr-console</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
     <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
-    <feature version="${dlux.version}">odl-dlux-all</feature>
+    <feature version="${dluxapps.version}">odl-dluxapps-applications</feature>
   </feature>
 
   <feature name='odl-unimgr-cisco-xr-driver' version='${project.version}'