Oops - checked in exposed Topo2 Dev by mistake; fixing...
Change-Id: I3f5b9aa5e34b50cee4f1cdb249ed559ff4383ae1
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index fa75f14..14b3db9 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -135,7 +135,7 @@
// FIXME: leave commented out for now, while still under development
// (remember to also comment out inclusions in index.html)
- new UiView(NETWORK, "topo2", "New-Topo"),
+// new UiView(NETWORK, "topo2", "New-Topo"),
new UiView(NETWORK, "device", "Devices", "nav_devs"),
new UiViewHidden("flow"),
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 5d6c7d4..e1d403d 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
@@ -102,7 +102,7 @@
// FIXME: this is temporary to prevent unhandled events being set to GUI...
// while Topo2 is still under development
-// topoSession.enableEvent(false);
+ topoSession.enableEvent(false);
}
@Override
diff --git a/web/gui/src/main/webapp/index.html b/web/gui/src/main/webapp/index.html
index fb0e67e..b391cde 100644
--- a/web/gui/src/main/webapp/index.html
+++ b/web/gui/src/main/webapp/index.html
@@ -132,7 +132,7 @@
<link rel="stylesheet" href="app/fw/widget/table-theme.css">
<!-- Under development for Region support. -->
- <script src="app/view/topo2/topo2.js"></script>
+ <!--<script src="app/view/topo2/topo2.js"></script>
<script src="app/view/topo2/topo2Breadcrumb.js"></script>
<script src="app/view/topo2/topo2Collection.js"></script>
<script src="app/view/topo2/topo2D3.js"></script>
@@ -170,7 +170,7 @@
<script src="app/view/topo2/topo2Zoom.js"></script>
<script src="app/view/topo2/uiView.js"></script>
<link rel="stylesheet" href="app/view/topo2/topo2.css">
- <link rel="stylesheet" href="app/view/topo2/topo2-theme.css">
+ <link rel="stylesheet" href="app/view/topo2/topo2-theme.css">-->
<!-- Builtin views javascript. -->