Fixes build, removes bazel files and makes onos-buck project happy again
Change-Id: I6231432b1be61b4004cef139529d9ab6c8b8574b
diff --git a/apps/dhcprelay/BUILD b/apps/dhcprelay/BUILD
deleted file mode 100644
index c444b1a..0000000
--- a/apps/dhcprelay/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-BUNDLES = [
- "//apps/dhcprelay/web:onos-apps-dhcprelay-web",
- "//apps/dhcprelay/app:onos-apps-dhcprelay-app",
-]
-
-onos_app(
- app_name = "org.onosproject.dhcprelay",
- category = "Utility",
- description = "DHCP Relay Agent Application.",
- included_bundles = BUNDLES,
- required_apps = ["org.onosproject.route-service"],
- title = "DHCP Relay Agent",
- url = "http://onosproject.org",
-)
diff --git a/apps/dhcprelay/app/BUILD b/apps/dhcprelay/app/BUILD
deleted file mode 100644
index 29e4908..0000000
--- a/apps/dhcprelay/app/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
- "//core/store/serializers:onos-core-serializers",
- "//apps/route-service/api:onos-apps-route-service-api",
- "//apps/routing/fpm/api:onos-apps-routing-fpm-api",
-]
-
-TEST_DEPS = TEST + [
- "//apps/route-service/api:onos-apps-route-service-api-tests",
- "//core/api:onos-api-tests",
-]
-
-osgi_jar_with_tests(
- test_deps = TEST_DEPS,
- deps = COMPILE_DEPS,
-)
diff --git a/apps/dhcprelay/app/pom.xml b/apps/dhcprelay/app/pom.xml
new file mode 100644
index 0000000..7d24ad4
--- /dev/null
+++ b/apps/dhcprelay/app/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2018-present Open Networking Foundation
+ ~
+ ~ 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-dhcprelay</artifactId>
+ <version>1.13.8-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>onos-apps-dhcprelay-app</artifactId>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-incubator-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-routing-fpm-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-core-serializers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-route-service-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-route-service-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index b2575e5..0f7a24f 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -21,14 +21,12 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
<version>1.13.8-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-app-dhcprelay</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>onos-apps-dhcprelay</artifactId>
+ <packaging>pom</packaging>
<description>DHCP Relay Agent</description>
- <url>http://onosproject.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,94 +38,9 @@
<onos.app.readme>DHCP Relay Agent Application.</onos.app.readme>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-api</artifactId>
- </dependency>
+ <modules>
+ <module>web</module>
+ <module>app</module>
+ </modules>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-incubator-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-apps-routing-fpm-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-api</artifactId>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-core-serializers</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-cli</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-apps-route-service-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-apps-route-service-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- </dependencies>
</project>
diff --git a/apps/dhcprelay/web/BUILD b/apps/dhcprelay/web/BUILD
deleted file mode 100644
index 1bdee49..0000000
--- a/apps/dhcprelay/web/BUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-COMPILE_DEPS = CORE_DEPS + KRYO + JACKSON + REST + CLI + [
- "@jersey_server//jar",
- "//core/store/serializers:onos-core-serializers",
- "//apps/route-service/api:onos-apps-route-service-api",
- "//apps/dhcprelay/app:onos-apps-dhcprelay-app",
- "//apps/routing/fpm/api:onos-apps-routing-fpm-api",
-]
-
-osgi_jar(
- api_description = "REST API for DHCPRelay",
- api_package = "org.onosproject.dhcprelay.rest",
- api_title = "REST API for DHCPRelay Agent Application",
- api_version = "1.0",
- web_context = "/onos/v1/dhcprelay",
- deps = COMPILE_DEPS,
-)
diff --git a/apps/dhcprelay/web/pom.xml b/apps/dhcprelay/web/pom.xml
new file mode 100644
index 0000000..138375c
--- /dev/null
+++ b/apps/dhcprelay/web/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2018-present Open Networking Foundation
+ ~
+ ~ 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-dhcprelay</artifactId>
+ <version>1.13.8-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>onos-apps-dhcprelay-web</artifactId>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <web.context>/onos/v1/dhcprelay</web.context>
+ <api.version>1.0.0</api.version>
+ <api.title>ONOS DHCP Relay Agent Application REST API</api.title>
+ <api.description>
+ APIs for interacting with the DHCP Relay Agent application.
+ </api.description>
+ <api.package>org.onosproject.dhcprelay.web</api.package>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-incubator-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-routing-fpm-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onlab-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-api</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-core-serializers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-route-service-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-apps-route-service-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java
index 1a48ea5..3f343f2 100644
--- a/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java
+++ b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java
@@ -43,7 +43,6 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import java.io.IOException;
import java.util.Collection;
import java.util.Map;
import java.util.List;
@@ -70,8 +69,7 @@
* Corresponding route from the route store
*
* @param prefix IpPrefix
- * @return 204 NO CONTENT
- * @throws IOException to signify bad request
+ * @return 204 NO CONTENT, 404; 401
*/
@DELETE
@Path("{prefix}")
diff --git a/modules.defs b/modules.defs
index ae0dfeb..ae4486a 100644
--- a/modules.defs
+++ b/modules.defs
@@ -280,7 +280,8 @@
'//apps/dhcp/app:onos-apps-dhcp-app',
'//apps/imr/api:onos-apps-imr-api',
'//apps/imr/app:onos-apps-imr-app',
- '//apps/dhcprelay:onos-apps-dhcprelay',
+ '//apps/dhcprelay/web:onos-apps-dhcprelay-web',
+ '//apps/dhcprelay/app:onos-apps-dhcprelay-app',
'//apps/fwd:onos-apps-fwd',
'//apps/iptopology-api:onos-apps-iptopology-api',
'//apps/routing/common:onos-apps-routing-common',