Make OpenROADM project importable on Eclipse.
- to accomodate AT&T's request.
- added required pom.xml for OpenROADM
Change-Id: I502ae52fe2e7678b6c1b15970401ccbd3a8489e7
diff --git a/apps/openroadm/network/pom.xml b/apps/openroadm/network/pom.xml
index 87594ab..eb08d46 100644
--- a/apps/openroadm/network/pom.xml
+++ b/apps/openroadm/network/pom.xml
@@ -22,20 +22,31 @@
<parent>
<artifactId>onos-apps-openroadm</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-apps-openroadm-network</artifactId>
- <version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Open ROADM Network Model</description>
<dependencies>
+
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-yang</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <artifactId>onos-yang-model</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-openroadm-yangmodel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/apps/openroadm/pom.xml b/apps/openroadm/pom.xml
index ffbadfa..6e5405c 100644
--- a/apps/openroadm/pom.xml
+++ b/apps/openroadm/pom.xml
@@ -22,18 +22,16 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>1.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-apps-openroadm</artifactId>
- <version>1.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Open ROADM Application</description>
+ <description>Open ROADM (1.2.1)Application</description>
<modules>
- <module>yangmodel</module>
<module>service</module>
<module>network</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/apps/openroadm/service/pom.xml b/apps/openroadm/service/pom.xml
index 7f5499a..71bd710 100644
--- a/apps/openroadm/service/pom.xml
+++ b/apps/openroadm/service/pom.xml
@@ -22,20 +22,31 @@
<parent>
<artifactId>onos-apps-openroadm</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-apps-openroadm-service</artifactId>
- <version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>Open ROADM Service Model</description>
<dependencies>
+
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-app-yang</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <artifactId>onos-yang-model</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-openroadm-yangmodel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/apps/pom.xml b/apps/pom.xml
index f6edde0..ad946b9 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -85,6 +85,7 @@
<module>mappingmanagement</module>
<module>network-troubleshoot</module>
<module>restconf</module>
+ <module>yang</module>
</modules>
<properties>
diff --git a/apps/yang/pom.xml b/apps/yang/pom.xml
new file mode 100644
index 0000000..1675168
--- /dev/null
+++ b/apps/yang/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017-present 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps</artifactId>
+ <version>1.11.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>onos-apps-yang</artifactId>
+ <packaging>bundle</packaging>
+ <description>YANG Compiler and Runtime</description>
+
+ <properties>
+ <onos.app.name>org.onosproject.yang</onos.app.name>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-serializers-xml</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-serializers-json</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-maven-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+</project>
diff --git a/lib/pom.xml b/lib/pom.xml
index 95accdc..d25b484 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -399,6 +399,16 @@
<artifactId>onos-yang-runtime</artifactId>
<version>${onos-yang-tools.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-serializers-xml</artifactId>
+ <version>${onos-yang-tools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-serializers-json</artifactId>
+ <version>${onos-yang-tools.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/models/openroadm/pom.xml b/models/openroadm/pom.xml
index 0ac295d..c6bc223 100644
--- a/models/openroadm/pom.xml
+++ b/models/openroadm/pom.xml
@@ -20,14 +20,141 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>onos-apps-openroadm</artifactId>
<groupId>org.onosproject</groupId>
- <version>1.2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>onos</artifactId>
+ <version>1.11.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>onos-apps-openroadm-yangmodel</artifactId>
- <version>1.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <description>Open ROADM YANG models</description>
-</project>
\ No newline at end of file
+ <description>Open ROADM YANG models (1.2.1)</description>
+
+ <properties>
+ <onos.app.name>org.onosproject.models.openroadm</onos.app.name>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-yang</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions combine.children="append">
+ <Include-Resource>yang/resources/YangMetaData.ser=target/classes/yang/resources/YangMetaData.ser</Include-Resource>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-compiler-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>onos-yang-plugin-workaround</id>
+ <!-- yang plugin cannot handle non-clean compilation -->
+ <phase>initialize</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>target/generated-sources</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-clean-plugin
+ </artifactId>
+ <versionRange>
+ [3.0.0,)
+ </versionRange>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
diff --git a/pom.xml b/pom.xml
index d5aa6a2..46702ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,8 @@
<module>incubator</module>
<module>features</module>
+ <module>models/openroadm</module>
+
<module>tools/package/archetypes</module>
<module>tools/package/branding</module>
</modules>