Remove the backend part of the Floodlight GUI.
(Frontend is removed by Naoki in separate commit)
Change-Id: I27dad02fedac26a8ffe9c64396fde87fc2f07a4b
diff --git a/conf/onos.properties b/conf/onos.properties
index 70f2d3c..d1912c5 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -1,7 +1,6 @@
floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
net.floodlightcontroller.threadpool.ThreadPool,\
net.onrc.onos.ofcontroller.floodlightlistener.RCNetworkGraphPublisher, \
-net.floodlightcontroller.ui.web.StaticWebRoutable,\
net.onrc.onos.datagrid.HazelcastDatagrid,\
net.onrc.onos.ofcontroller.flowprogrammer.FlowProgrammer,\
net.onrc.onos.intent.runtime.PathCalcRuntimeModule,\
diff --git a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
index daf1684..a51e499 100644
--- a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
+++ b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
@@ -105,7 +105,6 @@
logger.debug("Setting number of REST API threads to {}", numThreads);
server.getContext().getParameters().add("defaultThreads", numThreads);
}
- component.getClients().add(Protocol.CLAP);
component.getDefaultHost().attach(this);
component.start();
} catch (Exception e) {
diff --git a/src/main/java/net/floodlightcontroller/ui/web/StaticWebRoutable.java b/src/main/java/net/floodlightcontroller/ui/web/StaticWebRoutable.java
deleted file mode 100644
index e89f0be..0000000
--- a/src/main/java/net/floodlightcontroller/ui/web/StaticWebRoutable.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package net.floodlightcontroller.ui.web;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-import org.restlet.Client;
-import org.restlet.Context;
-import org.restlet.Restlet;
-import org.restlet.data.Protocol;
-import org.restlet.resource.Directory;
-import org.restlet.routing.Router;
-
-import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.floodlightcontroller.core.module.IFloodlightModule;
-import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.restserver.IRestApiService;
-import net.floodlightcontroller.restserver.RestletRoutable;
-
-public class StaticWebRoutable implements RestletRoutable, IFloodlightModule {
-
- private IRestApiService restApi;
-
- @Override
- public Collection<Class<? extends IFloodlightService>> getModuleDependencies() {
- Collection<Class<? extends IFloodlightService>> l =
- new ArrayList<Class<? extends IFloodlightService>>();
- l.add(IRestApiService.class);
- return l;
- }
-
- @Override
- public Collection<Class<? extends IFloodlightService>> getModuleServices() {
- return null;
- }
-
- @Override
- public Map<Class<? extends IFloodlightService>, IFloodlightService>
- getServiceImpls() {
- return null;
- }
-
- @Override
- public void init(FloodlightModuleContext context)
- throws FloodlightModuleException {
- restApi = context.getServiceImpl(IRestApiService.class);
- }
-
- @Override
- public void startUp(FloodlightModuleContext context) {
- // Add our REST API
- restApi.addRestletRoutable(this);
-
- }
-
- @Override
- public Restlet getRestlet(Context context) {
- Router router = new Router(context);
- router.attach("", new Directory(context, "clap://classloader/web/"));
- context.setClientDispatcher(new Client(context, Protocol.CLAP));
- return router;
- }
-
- @Override
- public String basePath() {
- return "/wm/floodlight/ui/";
- }
-
-}
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index 61e21e1..6c6f83e 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -5,7 +5,6 @@
net.floodlightcontroller.forwarding.Forwarding
net.floodlightcontroller.restserver.RestApiServer
net.floodlightcontroller.threadpool.ThreadPool
-net.floodlightcontroller.ui.web.StaticWebRoutable
net.floodlightcontroller.devicemanager.internal.DefaultEntityClassifier
net.floodlightcontroller.devicemanager.test.MockDeviceManager
net.floodlightcontroller.core.test.MockFloodlightProvider