Committed by
Gerrit Code Review
Extracted ovsdb host provider from ovsdb application
Change-Id: Idfc9016dfc85e229bdfd15a392e644b2930b7f57
Showing
6 changed files
with
84 additions
and
35 deletions
| ... | @@ -27,44 +27,23 @@ | ... | @@ -27,44 +27,23 @@ |
| 27 | </parent> | 27 | </parent> |
| 28 | 28 | ||
| 29 | <artifactId>onos-ovsdatabase</artifactId> | 29 | <artifactId>onos-ovsdatabase</artifactId> |
| 30 | - <packaging>pom</packaging> | 30 | + <packaging>bundle</packaging> |
| 31 | + | ||
| 32 | + <properties> | ||
| 33 | + <onos.app.name>org.onosproject.ovsdb</onos.app.name> | ||
| 34 | + <onos.app.requires> | ||
| 35 | + org.onosproject.ovsdb-base, | ||
| 36 | + org.onosproject.ovsdbhostprovider | ||
| 37 | + </onos.app.requires> | ||
| 38 | + </properties> | ||
| 39 | + | ||
| 40 | + <description>OVSDB southbound meta application</description> | ||
| 31 | 41 | ||
| 32 | <dependencies> | 42 | <dependencies> |
| 33 | <dependency> | 43 | <dependency> |
| 34 | <groupId>org.onosproject</groupId> | 44 | <groupId>org.onosproject</groupId> |
| 35 | - <artifactId>onos-ovsdb-rfc</artifactId> | ||
| 36 | - <version>${project.version}</version> | ||
| 37 | - </dependency> | ||
| 38 | - <dependency> | ||
| 39 | - <groupId>org.onosproject</groupId> | ||
| 40 | <artifactId>onos-ovsdb-api</artifactId> | 45 | <artifactId>onos-ovsdb-api</artifactId> |
| 41 | <version>${project.version}</version> | 46 | <version>${project.version}</version> |
| 42 | </dependency> | 47 | </dependency> |
| 43 | - <dependency> | ||
| 44 | - <groupId>org.onosproject</groupId> | ||
| 45 | - <artifactId>onos-ovsdb-ctl</artifactId> | ||
| 46 | - <version>${project.version}</version> | ||
| 47 | - </dependency> | ||
| 48 | - <dependency> | ||
| 49 | - <groupId>org.onosproject</groupId> | ||
| 50 | - <artifactId>onos-drivers</artifactId> | ||
| 51 | - <version>${project.version}</version> | ||
| 52 | - </dependency> | ||
| 53 | - <dependency> | ||
| 54 | - <groupId>org.onosproject</groupId> | ||
| 55 | - <artifactId>onos-ovsdb-provider-device</artifactId> | ||
| 56 | - <version>${project.version}</version> | ||
| 57 | - </dependency> | ||
| 58 | - <dependency> | ||
| 59 | - <groupId>org.onosproject</groupId> | ||
| 60 | - <artifactId>onos-ovsdb-provider-host</artifactId> | ||
| 61 | - <version>${project.version}</version> | ||
| 62 | - </dependency> | ||
| 63 | - <dependency> | ||
| 64 | - <groupId>org.onosproject</groupId> | ||
| 65 | - <artifactId>onos-ovsdb-provider-tunnel</artifactId> | ||
| 66 | - <version>${project.version}</version> | ||
| 67 | - </dependency> | ||
| 68 | </dependencies> | 48 | </dependencies> |
| 69 | - | ||
| 70 | </project> | 49 | </project> | ... | ... |
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | ~ See the License for the specific language governing permissions and | 14 | ~ See the License for the specific language governing permissions and |
| 15 | ~ limitations under the License. | 15 | ~ limitations under the License. |
| 16 | --> | 16 | --> |
| 17 | -<app name="org.onosproject.ovsdb" origin="ON.Lab" version="${project.version}" | 17 | +<app name="org.onosproject.ovsdb-base" origin="ON.Lab" version="${project.version}" |
| 18 | featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features" | 18 | featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features" |
| 19 | features="${project.artifactId}"> | 19 | features="${project.artifactId}"> |
| 20 | <description>${project.description}</description> | 20 | <description>${project.description}</description> |
| ... | @@ -25,6 +25,5 @@ | ... | @@ -25,6 +25,5 @@ |
| 25 | <artifact>mvn:${project.groupId}/onos-drivers/${project.version}</artifact> | 25 | <artifact>mvn:${project.groupId}/onos-drivers/${project.version}</artifact> |
| 26 | 26 | ||
| 27 | <artifact>mvn:${project.groupId}/onos-ovsdb-provider-device/${project.version}</artifact> | 27 | <artifact>mvn:${project.groupId}/onos-ovsdb-provider-device/${project.version}</artifact> |
| 28 | - <artifact>mvn:${project.groupId}/onos-ovsdb-provider-host/${project.version}</artifact> | ||
| 29 | <artifact>mvn:${project.groupId}/onos-ovsdb-provider-tunnel/${project.version}</artifact> | 28 | <artifact>mvn:${project.groupId}/onos-ovsdb-provider-tunnel/${project.version}</artifact> |
| 30 | </app> | 29 | </app> | ... | ... |
| ... | @@ -28,7 +28,6 @@ | ... | @@ -28,7 +28,6 @@ |
| 28 | <bundle>mvn:${project.groupId}/onos-ovsdb-ctl/${project.version}</bundle> | 28 | <bundle>mvn:${project.groupId}/onos-ovsdb-ctl/${project.version}</bundle> |
| 29 | 29 | ||
| 30 | <bundle>mvn:${project.groupId}/onos-ovsdb-provider-device/${project.version}</bundle> | 30 | <bundle>mvn:${project.groupId}/onos-ovsdb-provider-device/${project.version}</bundle> |
| 31 | - <bundle>mvn:${project.groupId}/onos-ovsdb-provider-host/${project.version}</bundle> | ||
| 32 | <bundle>mvn:${project.groupId}/onos-ovsdb-provider-tunnel/${project.version}</bundle> | 31 | <bundle>mvn:${project.groupId}/onos-ovsdb-provider-tunnel/${project.version}</bundle> |
| 33 | </feature> | 32 | </feature> |
| 34 | </features> | 33 | </features> | ... | ... |
providers/ovsdb/base/pom.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<!-- | ||
| 3 | + ~ Copyright 2016 Open Networking Laboratory | ||
| 4 | + ~ | ||
| 5 | + ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 6 | + ~ you may not use this file except in compliance with the License. | ||
| 7 | + ~ You may obtain a copy of the License at | ||
| 8 | + ~ | ||
| 9 | + ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| 10 | + ~ | ||
| 11 | + ~ Unless required by applicable law or agreed to in writing, software | ||
| 12 | + ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| 13 | + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 14 | + ~ See the License for the specific language governing permissions and | ||
| 15 | + ~ limitations under the License. | ||
| 16 | + --> | ||
| 17 | +<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| 18 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 19 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| 20 | + <modelVersion>4.0.0</modelVersion> | ||
| 21 | + | ||
| 22 | + <parent> | ||
| 23 | + <groupId>org.onosproject</groupId> | ||
| 24 | + <artifactId>onos-ovsdb-providers</artifactId> | ||
| 25 | + <version>1.5.0-SNAPSHOT</version> | ||
| 26 | + <relativePath>../pom.xml</relativePath> | ||
| 27 | + </parent> | ||
| 28 | + | ||
| 29 | + <artifactId>onos-ovsdb-base</artifactId> | ||
| 30 | + <packaging>pom</packaging> | ||
| 31 | + | ||
| 32 | + <description>OVSDB protocol southbound providers</description> | ||
| 33 | + | ||
| 34 | + <dependencies> | ||
| 35 | + <dependency> | ||
| 36 | + <groupId>org.onosproject</groupId> | ||
| 37 | + <artifactId>onos-ovsdb-rfc</artifactId> | ||
| 38 | + <version>${project.version}</version> | ||
| 39 | + </dependency> | ||
| 40 | + <dependency> | ||
| 41 | + <groupId>org.onosproject</groupId> | ||
| 42 | + <artifactId>onos-ovsdb-api</artifactId> | ||
| 43 | + <version>${project.version}</version> | ||
| 44 | + </dependency> | ||
| 45 | + <dependency> | ||
| 46 | + <groupId>org.onosproject</groupId> | ||
| 47 | + <artifactId>onos-ovsdb-ctl</artifactId> | ||
| 48 | + <version>${project.version}</version> | ||
| 49 | + </dependency> | ||
| 50 | + <dependency> | ||
| 51 | + <groupId>org.onosproject</groupId> | ||
| 52 | + <artifactId>onos-drivers</artifactId> | ||
| 53 | + <version>${project.version}</version> | ||
| 54 | + </dependency> | ||
| 55 | + <dependency> | ||
| 56 | + <groupId>org.onosproject</groupId> | ||
| 57 | + <artifactId>onos-ovsdb-provider-device</artifactId> | ||
| 58 | + <version>${project.version}</version> | ||
| 59 | + </dependency> | ||
| 60 | + <dependency> | ||
| 61 | + <groupId>org.onosproject</groupId> | ||
| 62 | + <artifactId>onos-ovsdb-provider-tunnel</artifactId> | ||
| 63 | + <version>${project.version}</version> | ||
| 64 | + </dependency> | ||
| 65 | + </dependencies> | ||
| 66 | + | ||
| 67 | +</project> |
| ... | @@ -28,6 +28,10 @@ | ... | @@ -28,6 +28,10 @@ |
| 28 | <artifactId>onos-ovsdb-provider-host</artifactId> | 28 | <artifactId>onos-ovsdb-provider-host</artifactId> |
| 29 | <packaging>bundle</packaging> | 29 | <packaging>bundle</packaging> |
| 30 | 30 | ||
| 31 | + <properties> | ||
| 32 | + <onos.app.name>org.onosproject.ovsdbhostprovider</onos.app.name> | ||
| 33 | + </properties> | ||
| 34 | + | ||
| 31 | <dependencies> | 35 | <dependencies> |
| 32 | <dependency> | 36 | <dependency> |
| 33 | <groupId>org.onosproject</groupId> | 37 | <groupId>org.onosproject</groupId> | ... | ... |
-
Please register or login to post a comment