Hooking ospf into the overall build.
More fixes are required to allow ospf/protocol and ospf/ctl to build.
Change-Id: I6367178a5dff56f13e4c67c4503bc59b7deb45cb
diff --git a/protocols/ospf/api/pom.xml b/protocols/ospf/api/pom.xml
index a2a6d32..a7b243b 100755
--- a/protocols/ospf/api/pom.xml
+++ b/protocols/ospf/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-ospf</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -40,22 +40,6 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.onosproject.ospf.*
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/protocols/ospf/api/src/main/java/org/onosproject/ospf/controller/OspfController.java b/protocols/ospf/api/src/main/java/org/onosproject/ospf/controller/OspfController.java
index 1cc7b81..9d812c8 100755
--- a/protocols/ospf/api/src/main/java/org/onosproject/ospf/controller/OspfController.java
+++ b/protocols/ospf/api/src/main/java/org/onosproject/ospf/controller/OspfController.java
@@ -1,90 +1,90 @@
-/*
- * 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.
- */
-package org.onosproject.ospf.controller;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Abstraction of an OSPF controller.
- * Serves as a one stop shop for obtaining OSPF devices and (un)register listeners on OSPF events.
- */
-public interface OspfController {
-
- /**
- * Registers a listener for router meta events.
- *
- * @param listener the listener to notify
- */
- void addRouterListener(OspfRouterListener listener);
-
- /**
- * Unregisters a router listener.
- *
- * @param listener the listener to unregister
- */
- void removeRouterListener(OspfRouterListener listener);
-
- /**
- * Registers a listener for OSPF message events.
- *
- * @param listener the listener to notify
- */
- void addLinkListener(OspfLinkListener listener);
-
- /**
- * Unregisters a link listener.
- *
- * @param listener the listener to unregister
- */
- void removeLinkListener(OspfLinkListener listener);
-
- /**
- * Updates configuration of processes.
- *
- * @param processes process info to update
- */
- public void updateConfig(List<OspfProcess> processes);
-
- /**
- * Deletes configuration parameters.
- *
- * @param processes list of process instance
- * @param attribute attribute to delete
- */
- public void deleteConfig(List<OspfProcess> processes, String attribute);
-
- /**
- * Gets the list of listeners registered for router events.
- *
- * @return list of listeners
- */
- Set<OspfRouterListener> listener();
-
- /**
- * Gets the list of listeners registered for link events.
- *
- * @return list of listeners
- */
- public Set<OspfLinkListener> linkListener();
-
- /**
- * Gets the configured process.
- *
- * @return list of process instances
- */
- public List<OspfProcess> getAllConfiguredProcesses();
+/*
+ * 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.
+ */
+package org.onosproject.ospf.controller;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Abstraction of an OSPF controller.
+ * Serves as a one stop shop for obtaining OSPF devices and (un)register listeners on OSPF events.
+ */
+public interface OspfController {
+
+ /**
+ * Registers a listener for router meta events.
+ *
+ * @param listener the listener to notify
+ */
+ void addRouterListener(OspfRouterListener listener);
+
+ /**
+ * Unregisters a router listener.
+ *
+ * @param listener the listener to unregister
+ */
+ void removeRouterListener(OspfRouterListener listener);
+
+ /**
+ * Registers a listener for OSPF message events.
+ *
+ * @param listener the listener to notify
+ */
+ void addLinkListener(OspfLinkListener listener);
+
+ /**
+ * Unregisters a link listener.
+ *
+ * @param listener the listener to unregister
+ */
+ void removeLinkListener(OspfLinkListener listener);
+
+ /**
+ * Updates configuration of processes.
+ *
+ * @param processes process info to update
+ */
+ public void updateConfig(List<OspfProcess> processes);
+
+ /**
+ * Deletes configuration parameters.
+ *
+ * @param processes list of process instance
+ * @param attribute attribute to delete
+ */
+ public void deleteConfig(List<OspfProcess> processes, String attribute);
+
+ /**
+ * Gets the list of listeners registered for router events.
+ *
+ * @return list of listeners
+ */
+ Set<OspfRouterListener> listener();
+
+ /**
+ * Gets the list of listeners registered for link events.
+ *
+ * @return list of listeners
+ */
+ public Set<OspfLinkListener> linkListener();
+
+ /**
+ * Gets the configured process.
+ *
+ * @return list of process instances
+ */
+ public List<OspfProcess> getAllConfiguredProcesses();
}
\ No newline at end of file
diff --git a/protocols/ospf/ctl/pom.xml b/protocols/ospf/ctl/pom.xml
index 6a9d877..454837e 100755
--- a/protocols/ospf/ctl/pom.xml
+++ b/protocols/ospf/ctl/pom.xml
@@ -21,14 +21,14 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-ospf</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>onos-ospf-ctl</artifactId>
<packaging>bundle</packaging>
- <description>ONOS Ospf controller subsystem API</description>
+ <description>ONOS OSPF controller subsystem API</description>
<dependencies>
<dependency>
diff --git a/protocols/ospf/pom.xml b/protocols/ospf/pom.xml
new file mode 100755
index 0000000..1a29f8b
--- /dev/null
+++ b/protocols/ospf/pom.xml
@@ -0,0 +1,40 @@
+<?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-protocols</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>onos-ospf</artifactId>
+ <packaging>pom</packaging>
+
+ <description>ONOS OSPF Protocol subsystem</description>
+
+ <modules>
+ <module>api</module>
+ <!--module>ctl</module-->
+ <!--module>protocol</module-->
+ </modules>
+
+</project>
diff --git a/protocols/ospf/protocol/pom.xml b/protocols/ospf/protocol/pom.xml
index eb04e23..606450e 100644
--- a/protocols/ospf/protocol/pom.xml
+++ b/protocols/ospf/protocol/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-ospf</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,15 +30,10 @@
<description>ONOS Ospf controller protocol</description>
<dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-ospf-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-ospf-api</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 4daacfe..729e36b 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -38,6 +38,7 @@
<module>ovsdb</module>
<module>bgp</module>
<module>rest</module>
+ <module>ospf</module>
</modules>
<dependencies>