Remove old RESTCONF server implemenation
Change-Id: I8a225a6bfc3552acdfbb2148a73e85cbb9ca3d93
diff --git a/protocols/restconf/server/rpp/BUCK b/protocols/restconf/server/rpp/BUCK
index 20d2d45..6531f88 100644
--- a/protocols/restconf/server/rpp/BUCK
+++ b/protocols/restconf/server/rpp/BUCK
@@ -4,8 +4,7 @@
'//lib:jersey-server',
'//lib:javax.ws.rs-api',
'//utils/rest:onlab-rest',
- '//protocols/restconf/server/api:onos-protocols-restconf-server-api',
- '//protocols/restconf/server/restconfmgr:onos-protocols-restconf-server-restconfmgr',
+ '//apps/restconf/api:onos-apps-restconf-api',
]
osgi_jar_with_tests (
diff --git a/protocols/restconf/server/rpp/pom.xml b/protocols/restconf/server/rpp/pom.xml
index 264d03e..bc0dfbb 100644
--- a/protocols/restconf/server/rpp/pom.xml
+++ b/protocols/restconf/server/rpp/pom.xml
@@ -42,12 +42,7 @@
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onos-restconf-server-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-restconf-server-restconfmanager</artifactId>
+ <artifactId>onos-app-restconf-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/protocols/restconf/server/rpp/src/main/java/org/onosproject/protocol/restconf/server/rpp/RestconfWebResource.java b/protocols/restconf/server/rpp/src/main/java/org/onosproject/protocol/restconf/server/rpp/RestconfWebResource.java
index 0e0a686..ceba1e0 100644
--- a/protocols/restconf/server/rpp/src/main/java/org/onosproject/protocol/restconf/server/rpp/RestconfWebResource.java
+++ b/protocols/restconf/server/rpp/src/main/java/org/onosproject/protocol/restconf/server/rpp/RestconfWebResource.java
@@ -19,10 +19,10 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.glassfish.jersey.server.ChunkedOutput;
-import org.onosproject.protocol.restconf.server.api.Patch;
-import org.onosproject.protocol.restconf.server.api.RestconfException;
-import org.onosproject.protocol.restconf.server.api.RestconfServiceBroker;
import org.onosproject.rest.AbstractWebResource;
+import org.onosproject.restconf.api.Patch;
+import org.onosproject.restconf.api.RestconfException;
+import org.onosproject.restconf.api.RestconfService;
import org.slf4j.Logger;
import javax.ws.rs.Consumes;
@@ -62,7 +62,7 @@
@Context
UriInfo uriInfo;
- private final RestconfServiceBroker service = get(RestconfServiceBroker.class);
+ private final RestconfService service = get(RestconfService.class);
private final Logger log = getLogger(getClass());
/**