Extracted ovsdb host provider from ovsdb application
Change-Id: Idfc9016dfc85e229bdfd15a392e644b2930b7f57
diff --git a/providers/ovsdb/app/pom.xml b/providers/ovsdb/app/pom.xml
index f06bc98..863415a 100644
--- a/providers/ovsdb/app/pom.xml
+++ b/providers/ovsdb/app/pom.xml
@@ -27,44 +27,23 @@
</parent>
<artifactId>onos-ovsdatabase</artifactId>
- <packaging>pom</packaging>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <onos.app.name>org.onosproject.ovsdb</onos.app.name>
+ <onos.app.requires>
+ org.onosproject.ovsdb-base,
+ org.onosproject.ovsdbhostprovider
+ </onos.app.requires>
+ </properties>
+
+ <description>OVSDB southbound meta application</description>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-ovsdb-rfc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
<artifactId>onos-ovsdb-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-ovsdb-ctl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-drivers</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-ovsdb-provider-device</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-ovsdb-provider-host</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-ovsdb-provider-tunnel</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
-
</project>
diff --git a/providers/ovsdb/app/app.xml b/providers/ovsdb/base/app.xml
similarity index 88%
rename from providers/ovsdb/app/app.xml
rename to providers/ovsdb/base/app.xml
index c333499..b6e3b3d 100644
--- a/providers/ovsdb/app/app.xml
+++ b/providers/ovsdb/base/app.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<app name="org.onosproject.ovsdb" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.ovsdb-base" origin="ON.Lab" version="${project.version}"
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
features="${project.artifactId}">
<description>${project.description}</description>
@@ -25,6 +25,5 @@
<artifact>mvn:${project.groupId}/onos-drivers/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-ovsdb-provider-device/${project.version}</artifact>
- <artifact>mvn:${project.groupId}/onos-ovsdb-provider-host/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-ovsdb-provider-tunnel/${project.version}</artifact>
</app>
diff --git a/providers/ovsdb/app/features.xml b/providers/ovsdb/base/features.xml
similarity index 94%
rename from providers/ovsdb/app/features.xml
rename to providers/ovsdb/base/features.xml
index d2cb0aa..8f5a01a 100644
--- a/providers/ovsdb/app/features.xml
+++ b/providers/ovsdb/base/features.xml
@@ -28,7 +28,6 @@
<bundle>mvn:${project.groupId}/onos-ovsdb-ctl/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-ovsdb-provider-device/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-ovsdb-provider-host/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-ovsdb-provider-tunnel/${project.version}</bundle>
</feature>
</features>
diff --git a/providers/ovsdb/base/pom.xml b/providers/ovsdb/base/pom.xml
new file mode 100644
index 0000000..9b53ca8
--- /dev/null
+++ b/providers/ovsdb/base/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2016 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.
+ -->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-providers</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>onos-ovsdb-base</artifactId>
+ <packaging>pom</packaging>
+
+ <description>OVSDB protocol southbound providers</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-rfc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-ctl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-drivers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-provider-device</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-ovsdb-provider-tunnel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/providers/ovsdb/host/pom.xml b/providers/ovsdb/host/pom.xml
index 2f233bf..da9e8f3 100644
--- a/providers/ovsdb/host/pom.xml
+++ b/providers/ovsdb/host/pom.xml
@@ -28,6 +28,10 @@
<artifactId>onos-ovsdb-provider-host</artifactId>
<packaging>bundle</packaging>
+ <properties>
+ <onos.app.name>org.onosproject.ovsdbhostprovider</onos.app.name>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/providers/ovsdb/pom.xml b/providers/ovsdb/pom.xml
index 37bf527..72cb92c 100644
--- a/providers/ovsdb/pom.xml
+++ b/providers/ovsdb/pom.xml
@@ -33,6 +33,7 @@
<module>host</module>
<module>tunnel</module>
<module>app</module>
+ <module>base</module>
</modules>
<dependencies>