홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
5f39965c 1 parent 01a883cb

Migrated legacy GUI resources out of the way for the new GUI. 

Change-Id: I92dff4012c63d2f60ee61b5d10cbc4a384d49233
Inline Side-by-side
Showing 26 changed files with 11 additions and 11 deletions
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <display-name>ONOS GUI</display-name> 21 <display-name>ONOS GUI</display-name>
22 22
23 <welcome-file-list> 23 <welcome-file-list>
24 - <welcome-file>index.html</welcome-file> 24 + <welcome-file>legacy/index.html</welcome-file>
25 </welcome-file-list> 25 </welcome-file-list>
26 26
27 <!-- 27 <!--
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 </init-param> 97 </init-param>
98 <init-param> 98 <init-param>
99 <param-name>com.sun.jersey.config.property.classnames</param-name> 99 <param-name>com.sun.jersey.config.property.classnames</param-name>
100 - <param-value>org.onosproject.gui.impl.MainViewResource</param-value> 100 + <param-value>org.onosproject.ui.impl.MainViewResource</param-value>
101 </init-param> 101 </init-param>
102 <load-on-startup>1</load-on-startup> 102 <load-on-startup>1</load-on-startup>
103 </servlet> 103 </servlet>
......
This diff could not be displayed because it is too large.
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
22 <html> 22 <html>
23 <head> 23 <head>
24 <meta charset="utf-8"> 24 <meta charset="utf-8">
25 - <link rel="shortcut icon" href="img/onos-logo.png"> 25 + <link rel="shortcut icon" href="../img/onos-logo.png">
26 <title>ONOS</title> 26 <title>ONOS</title>
27 27
28 <!-- Third party library code included here --> 28 <!-- Third party library code included here -->
29 <!--TODO: use the minified version of d3, once debugging is complete --> 29 <!--TODO: use the minified version of d3, once debugging is complete -->
30 - <script src="tp/d3.js"></script> 30 + <script src="../tp/d3.js"></script>
31 - <script src="tp/topojson.v1.min.js"></script> 31 + <script src="../tp/topojson.v1.min.js"></script>
32 - <script src="tp/jquery-2.1.1.min.js"></script> 32 + <script src="../tp/jquery-2.1.1.min.js"></script>
33 33
34 <!-- ONOS UI Framework included here --> 34 <!-- ONOS UI Framework included here -->
35 <script src="onos.js"></script> 35 <script src="onos.js"></script>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 mast.append('img') 36 mast.append('img')
37 .attr({ 37 .attr({
38 id: 'logo', 38 id: 'logo',
39 - src: 'img/onos-logo.png' 39 + src: 'onos-logo.png'
40 }); 40 });
41 41
42 mast.append('span') 42 mast.append('span')
......
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
34 options: { 34 options: {
35 showBackground: true 35 showBackground: true
36 }, 36 },
37 - webSockUrl: 'ws/topology', 37 + webSockUrl: '../ws/topology',
38 data: { 38 data: {
39 live: { 39 live: {
40 - jsonUrl: 'rs/topology/graph', 40 + jsonUrl: '../rs/topology/graph',
41 - detailPrefix: 'rs/topology/graph/', 41 + detailPrefix: '../rs/topology/graph/',
42 detailSuffix: '' 42 detailSuffix: ''
43 }, 43 },
44 fake: { 44 fake: {
...@@ -3029,7 +3029,7 @@ ...@@ -3029,7 +3029,7 @@
3029 stopAntTimer(); 3029 stopAntTimer();
3030 } 3030 }
3031 3031
3032 - var geoJsonUrl = 'data/map/continental_us.json', 3032 + var geoJsonUrl = 'continental_us.json',
3033 geoJson; 3033 geoJson;
3034 3034
3035 function loadGeoJsonData() { 3035 function loadGeoJsonData() {
......