Separating onos-drivers to be delivered as a separate app from onos-openflow. Apps activated by default (via onos-setup-karaf or onos-install/onos-config) are now onos-drivers and onos-openflow.
Change-Id: I35c7cca79a4b72e966cbc2cebe72b109f2d92706
diff --git a/providers/openflow/app/app.xml b/providers/openflow/app/app.xml
index afa63fa..e143328 100644
--- a/providers/openflow/app/app.xml
+++ b/providers/openflow/app/app.xml
@@ -15,8 +15,9 @@
~ limitations under the License.
-->
<app name="org.onosproject.openflow" origin="ON.Lab" version="${feature.version}"
- features="onos-openflow">
- <description>OpenFlow protocol southbound providers</description>
+ featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
+ features="${project.artifactId}">
+ <description>${project.description}</description>
<artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-of-drivers/${project.version}</artifact>
diff --git a/providers/openflow/app/features.xml b/providers/openflow/app/features.xml
new file mode 100644
index 0000000..521a20b
--- /dev/null
+++ b/providers/openflow/app/features.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ ~ Copyright 2015 Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${feature.version}">
+ <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
+ <feature name="${project.artifactId}" version="${feature.version}"
+ description="${project.description}">
+ <feature>onos-api</feature>
+ <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-api/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-drivers/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-ctl/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-drivers/${project.version}</bundle>
+
+ <bundle>mvn:${project.groupId}/onos-lldp-provider/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-host-provider/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-provider-device/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-provider-packet/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-provider-flow/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-of-provider-group/${project.version}</bundle>
+ </feature>
+</features>
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index bcbb632..42a03d3 100644
--- a/providers/openflow/app/pom.xml
+++ b/providers/openflow/app/pom.xml
@@ -26,10 +26,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-of-providers-app</artifactId>
+ <artifactId>onos-openflow</artifactId>
<packaging>pom</packaging>
- <description>ONOS OpenFlow providers app</description>
+ <description>OpenFlow protocol southbound providers</description>
<dependencies>
<dependency>
diff --git a/providers/pom.xml b/providers/pom.xml
index 23f6f0d..70d867e 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -70,7 +70,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>