From b731e2f1dd0972409b136aebc7b463dd72c9cfad Mon Sep 17 00:00:00 2001
From: CNlucius <lukai1@huawei.com>
Date: Tue, 13 Sep 2016 11:40:12 +0800
Subject: ONOSFW-171

O/S-SFC-ONOS scenario documentation

Change-Id: I51ae1cf736ea24ab6680f8edca1b2bf5dd598365
Signed-off-by: CNlucius <lukai1@huawei.com>
---
 framework/src/onos/utils/rest/pom.xml              | 53 --------------------
 .../src/main/java/org/onlab/rest/BaseResource.java | 57 ----------------------
 .../src/main/java/org/onlab/rest/package-info.java | 20 --------
 3 files changed, 130 deletions(-)
 delete mode 100644 framework/src/onos/utils/rest/pom.xml
 delete mode 100644 framework/src/onos/utils/rest/src/main/java/org/onlab/rest/BaseResource.java
 delete mode 100644 framework/src/onos/utils/rest/src/main/java/org/onlab/rest/package-info.java

(limited to 'framework/src/onos/utils/rest')

diff --git a/framework/src/onos/utils/rest/pom.xml b/framework/src/onos/utils/rest/pom.xml
deleted file mode 100644
index 80a2e32e..00000000
--- a/framework/src/onos/utils/rest/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014 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>onlab-utils</artifactId>
-        <version>1.4.0-rc1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onlab-rest</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ON.Lab JAX-RS utilities</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.jersey.jersey-test-framework</groupId>
-            <artifactId>jersey-test-framework-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.jersey-test-framework</groupId>
-            <artifactId>jersey-test-framework-grizzly2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onlab-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/framework/src/onos/utils/rest/src/main/java/org/onlab/rest/BaseResource.java b/framework/src/onos/utils/rest/src/main/java/org/onlab/rest/BaseResource.java
deleted file mode 100644
index 50b4d0f1..00000000
--- a/framework/src/onos/utils/rest/src/main/java/org/onlab/rest/BaseResource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014 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.onlab.rest;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-
-import javax.ws.rs.core.Response;
-
-/**
- * Base abstraction of a JAX-RS resource.
- */
-public abstract class BaseResource {
-
-    private static ServiceDirectory services = new DefaultServiceDirectory();
-
-    /**
-     * Sets alternate service directory to be used for lookups.
-     * <p>
-     * Intended to ease unit testing and not intended for use in production.
-     * </p>
-     *
-     * @param serviceDirectory alternate service directory
-     */
-    public static void setServiceDirectory(ServiceDirectory serviceDirectory) {
-        services = serviceDirectory;
-    }
-
-    /**
-     * Returns reference to the specified service implementation.
-     *
-     * @param service service class
-     * @param <T>     type of service
-     * @return service implementation
-     */
-    public <T> T get(Class<T> service) {
-        return services.get(service);
-    }
-
-    protected static Response.ResponseBuilder ok(Object obj) {
-        return Response.ok(obj);
-    }
-
-}
diff --git a/framework/src/onos/utils/rest/src/main/java/org/onlab/rest/package-info.java b/framework/src/onos/utils/rest/src/main/java/org/onlab/rest/package-info.java
deleted file mode 100644
index 4f9c523d..00000000
--- a/framework/src/onos/utils/rest/src/main/java/org/onlab/rest/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2014 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.
- */
-
-/**
- * Facilities for building JAX-RS web resources.
- */
-package org.onlab.rest;
-- 
cgit 1.2.3-korg