From dd7fcea54bc00b63924a343db4605592489ff077 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 29 Jul 2016 15:19:44 +0200
Subject: HONEYCOMB-130: Rename features (remove odl prefix)

Change-Id: I31db89469f6a619ced0c645f1c9375d7b60f1320
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 infra/features/src/main/features/features.xml      | 19 ++++++-------------
 infra/karaf/pom.xml                                |  2 +-
 v3po/features/src/main/features/features.xml       | 21 ++++++++-------------
 vpp-common/features/src/main/features/features.xml |  6 +++---
 .../features/src/main/features/features.xml        | 22 ++++++++--------------
 5 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/infra/features/src/main/features/features.xml b/infra/features/src/main/features/features.xml
index d0431d656..bfc5ad8f0 100644
--- a/infra/features/src/main/features/features.xml
+++ b/infra/features/src/main/features/features.xml
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<features name="odl-honeycomb-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="honeycomb-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
   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.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
@@ -24,13 +24,13 @@
   <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${netconf.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
 
-  <feature name='odl-honeycomb-api' version='${project.version}' description='OpenDaylight :: honeycomb :: api'>
+  <feature name='honeycomb-api' version='${project.version}' description='OpenDaylight :: honeycomb :: api'>
     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
   </feature>
 
-  <feature name='odl-honeycomb' version='${project.version}' description='OpenDaylight :: honeycomb'>
+  <feature name='honeycomb' version='${project.version}' description='OpenDaylight :: honeycomb'>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-honeycomb-api</feature>
+    <feature version='${project.version}'>honeycomb-api</feature>
     <!-- FIXME remove netconf-connector-ssh from features, only netconf northbound is needed -->
     <feature version='${netconf.version}'>odl-netconf-connector-ssh</feature>
     <feature version='${mdsal.version}'>odl-netconf-mdsal</feature>
@@ -51,8 +51,8 @@
     <configfile finalname="${configfile.directory}/honeycomb-init.xml">mvn:io.fd.honeycomb/honeycomb-impl/{{VERSION}}/xml/init</configfile>
   </feature>
 
-  <feature name='odl-honeycomb-rest' version='${project.version}' description='OpenDaylight :: honeycomb :: REST'>
-    <feature version="${project.version}">odl-honeycomb</feature>
+  <feature name='honeycomb-rest' version='${project.version}' description='OpenDaylight :: honeycomb :: REST'>
+    <feature version="${project.version}">honeycomb</feature>
     <feature version="${restconf.version}">odl-restconf</feature>
     <!-- Northbound interfaces configuration -->
     <configfile finalname="${configfile.directory}/honeycomb-netconf.xml">mvn:io.fd.honeycomb/honeycomb-impl/{{VERSION}}/xml/netconf</configfile>
@@ -60,11 +60,4 @@
     <configfile finalname="${configfile.directory}/honeycomb-restconf.xml">mvn:io.fd.honeycomb/honeycomb-impl/{{VERSION}}/xml/restconf</configfile>
   </feature>
 
-  <feature name='odl-honeycomb-ui' version='${project.version}' description='OpenDaylight :: honeycomb :: UI'>
-    <feature version="${project.version}">odl-honeycomb-rest</feature>
-    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
-    <feature version="${dlux.version}">odl-dlux-yangui</feature>
-  </feature>
-
 </features>
diff --git a/infra/karaf/pom.xml b/infra/karaf/pom.xml
index 6cee0295b..ea42624a9 100644
--- a/infra/karaf/pom.xml
+++ b/infra/karaf/pom.xml
@@ -29,7 +29,7 @@
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <karaf.localFeature>odl-honeycomb-ui</karaf.localFeature>
+    <karaf.localFeature>honeycomb-rest</karaf.localFeature>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/v3po/features/src/main/features/features.xml b/v3po/features/src/main/features/features.xml
index ef2a27532..9ef25aac9 100644
--- a/v3po/features/src/main/features/features.xml
+++ b/v3po/features/src/main/features/features.xml
@@ -22,27 +22,22 @@
   <repository>mvn:io.fd.honeycomb.vpp/vpp-common-features/${project.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
 
-  <feature name='odl-honeycomb-v3po-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
+  <feature name='honeycomb-v3po-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <bundle>mvn:io.fd.honeycomb.v3po/v3po-api/{{VERSION}}</bundle>
   </feature>
 
-  <feature name='odl-honeycomb-v3po' version='${project.version}' description='OpenDaylight :: v3po'>
-    <feature version='${project.version}'>odl-honeycomb</feature>
-    <feature version='${project.version}'>odl-honeycomb-vpp-common</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po-api</feature>
+  <feature name='honeycomb-v3po' version='${project.version}' description='OpenDaylight :: v3po'>
+    <feature version='${project.version}'>honeycomb</feature>
+    <feature version='${project.version}'>honeycomb-vpp-common</feature>
+    <feature version='${project.version}'>honeycomb-v3po-api</feature>
     <bundle>mvn:io.fd.honeycomb.v3po/v3po2vpp/{{VERSION}}</bundle>
     <configfile finalname="${configfile.directory}/honeycomb-v3po.xml">mvn:io.fd.honeycomb.v3po/v3po2vpp/{{VERSION}}/xml/config</configfile>
   </feature>
 
-  <feature name='odl-honeycomb-v3po-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
-    <feature version='${project.version}'>odl-honeycomb-rest</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po</feature>
-  </feature>
-
-  <feature name='odl-honeycomb-v3po-ui' version='${project.version}' description='OpenDaylight :: v3po :: ui'>
-    <feature version='${project.version}'>odl-honeycomb-ui</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po-rest</feature>
+  <feature name='honeycomb-v3po-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
+    <feature version='${project.version}'>honeycomb-rest</feature>
+    <feature version='${project.version}'>honeycomb-v3po</feature>
   </feature>
 
 </features>
diff --git a/vpp-common/features/src/main/features/features.xml b/vpp-common/features/src/main/features/features.xml
index 3983481dd..321f96e1c 100644
--- a/vpp-common/features/src/main/features/features.xml
+++ b/vpp-common/features/src/main/features/features.xml
@@ -14,13 +14,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<features name="odl-honeycomb-vpp-common-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="honeycomb-vpp-common-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
   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:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository>
 
-  <feature name='odl-honeycomb-vpp-common' version='${project.version}' description='OpenDaylight :: honeycomb :: vpp-common'>
-    <feature version='${project.version}'>odl-honeycomb</feature>
+  <feature name='honeycomb-vpp-common' version='${project.version}' description='OpenDaylight :: honeycomb :: vpp-common'>
+    <feature version='${project.version}'>honeycomb</feature>
     <bundle>mvn:io.fd.honeycomb.vpp/naming-context-api/{{VERSION}}</bundle>
     <bundle>mvn:io.fd.honeycomb.vpp/naming-context-impl/{{VERSION}}</bundle>
     <bundle>wrap:mvn:io.fd.vpp/jvpp/{{VERSION}}</bundle>
diff --git a/vpp-integration/features/src/main/features/features.xml b/vpp-integration/features/src/main/features/features.xml
index f25e32d05..3dcc7c67a 100644
--- a/vpp-integration/features/src/main/features/features.xml
+++ b/vpp-integration/features/src/main/features/features.xml
@@ -14,7 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<features name="odl-honeycomb-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="honeycomb-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
   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">
 
@@ -26,27 +26,21 @@
   <repository>mvn:io.fd.honeycomb.v3po/v3po-features/${project.version}/xml/features</repository>
 
   <feature name='honeycomb-vpp-integration-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
-    <feature version='${project.version}'>odl-honeycomb-api</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po-api</feature>
+    <feature version='${project.version}'>honeycomb-api</feature>
+    <feature version='${project.version}'>honeycomb-v3po-api</feature>
   </feature>
 
   <feature name='honeycomb-vpp-integration' version='${project.version}' description='OpenDaylight :: v3po'>
     <feature version='${project.version}'>honeycomb-vpp-integration-api</feature>
-    <feature version='${project.version}'>odl-honeycomb</feature>
-    <feature version='${project.version}'>odl-honeycomb-vpp-common</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po</feature>
+    <feature version='${project.version}'>honeycomb</feature>
+    <feature version='${project.version}'>honeycomb-vpp-common</feature>
+    <feature version='${project.version}'>honeycomb-v3po</feature>
   </feature>
 
   <feature name='honeycomb-vpp-integration-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
     <feature version='${project.version}'>honeycomb-vpp-integration</feature>
-    <feature version='${project.version}'>odl-honeycomb-rest</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po</feature>
-  </feature>
-
-  <feature name='honeycomb-vpp-integration-ui' version='${project.version}' description='OpenDaylight :: v3po :: ui'>
-    <feature version='${project.version}'>honeycomb-vpp-integration-rest</feature>
-    <feature version='${project.version}'>odl-honeycomb-ui</feature>
-    <feature version='${project.version}'>odl-honeycomb-v3po-rest</feature>
+    <feature version='${project.version}'>honeycomb-rest</feature>
+    <feature version='${project.version}'>honeycomb-v3po</feature>
   </feature>
 
 </features>
-- 
cgit 1.2.3-korg