Fixing GUI to bypass the new UiTopoSession code which is not ready.
Change-Id: I5bcee7897f43867fc4d6157c44420937265d488b
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java
index d1d7950..38af57d 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java
@@ -28,8 +28,6 @@
import org.onosproject.ui.UiMessageHandler;
import org.onosproject.ui.UiMessageHandlerFactory;
import org.onosproject.ui.UiTopoOverlayFactory;
-import org.onosproject.ui.impl.topo.UiTopoSession;
-import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
import org.onosproject.ui.topo.TopoConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +63,7 @@
private final ObjectMapper mapper = new ObjectMapper();
private final ServiceDirectory directory;
- private final UiTopoSession topoSession;
+// private final UiTopoSession topoSession;
private Connection connection;
private FrameConnection control;
@@ -85,8 +83,8 @@
public UiWebSocket(ServiceDirectory directory, String userName) {
this.directory = directory;
this.userName = userName;
- this.topoSession =
- new UiTopoSession(this, directory.get(UiSharedTopologyModel.class));
+// this.topoSession =
+// new UiTopoSession(this, directory.get(UiSharedTopologyModel.class));
}
@Override
@@ -130,7 +128,7 @@
this.connection = connection;
this.control = (FrameConnection) connection;
try {
- topoSession.init();
+// topoSession.init();
createHandlersAndOverlays();
sendBootstrapData();
log.info("GUI client connected -- user <{}>", userName);
@@ -145,7 +143,7 @@
@Override
public synchronized void onClose(int closeCode, String message) {
- topoSession.destroy();
+// topoSession.destroy();
destroyHandlersAndOverlays();
log.info("GUI client disconnected [close-code={}, message={}]",
closeCode, message);
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
index 48ae42f..7dca64e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/model/UiSharedTopologyModel.java
@@ -66,7 +66,7 @@
/**
* Service that creates and maintains the UI-model of the network topology.
*/
-@Component(immediate = true)
+@Component(immediate = true, enabled = false)
@Service(value = UiSharedTopologyModel.class)
public final class UiSharedTopologyModel
extends AbstractListenerManager<UiModelEvent, UiModelListener> {