GUI -- Dropped the '2' in filenames.

 - renamed 'libs' dir to 'tp' (third-party), so we can use 'lib' for our own libraries.

Change-Id: I2d9e1c6c20cf2dc45451e1fa01aad5f658666111

@@ -26,8 +26,8 @@
     <title>ONOS GUI</title>
     <title>ONOS GUI</title>
 
 
     <!--TODO: use the minified version of d3, once debugging is complete -->
     <!--TODO: use the minified version of d3, once debugging is complete -->
-    <script src="../libs/d3.js"></script>
-    <script src="../libs/jquery-2.1.1.min.js"></script>
+    <script src="../tp/d3.js"></script>
+    <script src="../tp/jquery-2.1.1.min.js"></script>
 
 
     <link rel="stylesheet" href="../base.css">
     <link rel="stylesheet" href="../base.css">
     <link rel="stylesheet" href="onos.css">
     <link rel="stylesheet" href="onos.css">

@@ -14,14 +14,14 @@
   ~ See the License for the specific language governing permissions and
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~ limitations under the License.
   -->
   -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://java.sun.com/xml/ns/javaee"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          id="ONOS" version="2.5">
          id="ONOS" version="2.5">
     <display-name>ONOS GUI</display-name>
     <display-name>ONOS GUI</display-name>
 
 
     <welcome-file-list>
     <welcome-file-list>
-        <welcome-file>index2.html</welcome-file>
+        <welcome-file>index.html</welcome-file>
     </welcome-file-list>
     </welcome-file-list>
 
 
     <servlet>
     <servlet>

@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta charset="utf-8">
     <title>Icons</title>
     <title>Icons</title>
 
 
-    <script src="../libs/d3.js"></script>
-    <script src="../libs/topojson.v1.min.js"></script>
-    <script src="../libs/jquery-2.1.1.min.js"></script>
+    <script src="../tp/d3.js"></script>
+    <script src="../tp/topojson.v1.min.js"></script>
+    <script src="../tp/jquery-2.1.1.min.js"></script>
 
 
     <style>
     <style>
         html,
         html,

@@ -30,28 +30,28 @@
 
 
     <!-- Third party library code included here -->
     <!-- Third party library code included here -->
     <!--TODO: use the minified version of d3, once debugging is complete -->
     <!--TODO: use the minified version of d3, once debugging is complete -->
-    <script src="libs/d3.js"></script>
-    <script src="libs/topojson.v1.min.js"></script>
-    <script src="libs/jquery-2.1.1.min.js"></script>
+    <script src="tp/d3.js"></script>
+    <script src="tp/topojson.v1.min.js"></script>
+    <script src="tp/jquery-2.1.1.min.js"></script>
 
 
     <!-- Base library and framework stylesheets included here -->
     <!-- Base library and framework stylesheets included here -->
     <link rel="stylesheet" href="base.css">
     <link rel="stylesheet" href="base.css">
-    <link rel="stylesheet" href="onos2.css">
-    <link rel="stylesheet" href="mast2.css">
-    <link rel="stylesheet" href="floatPanel.css">
-    <link rel="stylesheet" href="feedback.css">
+    <link rel="stylesheet" href="onos.css">
+    <link rel="stylesheet" href="onosMast.css">
+    <link rel="stylesheet" href="onosFloatPanel.css">
+    <link rel="stylesheet" href="onosFlash.css">
     <link rel="stylesheet" href="onosQuickHelp.css">
     <link rel="stylesheet" href="onosQuickHelp.css">
 
 
     <!-- This is where contributed stylesheets get INJECTED -->
     <!-- This is where contributed stylesheets get INJECTED -->
     <!-- TODO: replace with template marker and inject refs server-side -->
     <!-- TODO: replace with template marker and inject refs server-side -->
-    <link rel="stylesheet" href="topo2.css">
+    <link rel="stylesheet" href="topo.css">
 
 
 
 
     <!-- General library modules included here-->
     <!-- General library modules included here-->
-    <script src="geometry2.js"></script>
+    <script src="geometry.js"></script>
 
 
     <!-- ONOS UI Framework included here-->
     <!-- ONOS UI Framework included here-->
-    <script src="onos2.js"></script>
+    <script src="onos.js"></script>
 
 
 </head>
 </head>
 <body>
 <body>
@@ -91,8 +91,8 @@
     <script src="glyphs.js"></script>
     <script src="glyphs.js"></script>
 
 
     <!-- Framework module files included here -->
     <!-- Framework module files included here -->
-    <script src="mast2.js"></script>
-    <script src="feedback.js"></script>
+    <script src="onosMast.js"></script>
+    <script src="onosFlash.js"></script>
     <script src="onosQuickHelp.js"></script>
     <script src="onosQuickHelp.js"></script>
 
 
     <!-- View Module Templates; REMOVE THESE LINES, FOR PRODUCTION -->
     <!-- View Module Templates; REMOVE THESE LINES, FOR PRODUCTION -->
@@ -100,14 +100,14 @@
     <script src="module-div-template.js"></script>
     <script src="module-div-template.js"></script>
 
 
     <!-- Sample views; REMOVE THESE LINES, FOR PRODUCTION -->
     <!-- Sample views; REMOVE THESE LINES, FOR PRODUCTION -->
-    <script src="sample2.js"></script>
+    <script src="sample.js"></script>
     <script src="sampleRadio.js"></script>
     <script src="sampleRadio.js"></script>
     <script src="sampleKeys.js"></script>
     <script src="sampleKeys.js"></script>
     <script src="sampleHash.js"></script>
     <script src="sampleHash.js"></script>
 
 
     <!-- Contributed (application) views injected here -->
     <!-- Contributed (application) views injected here -->
     <!-- TODO: replace with template marker and inject refs server-side -->
     <!-- TODO: replace with template marker and inject refs server-side -->
-    <script src="topo2.js"></script>
+    <script src="topo.js"></script>
 
 
     <!-- finally, build the UI-->
     <!-- finally, build the UI-->
     <script type="text/javascript">
     <script type="text/javascript">

@@ -1987,7 +1987,7 @@
             .replace(/\#.*/, '')
             .replace(/\#.*/, '')
             .replace('http://', 'ws://')
             .replace('http://', 'ws://')
             .replace('https://', 'wss://')
             .replace('https://', 'wss://')
-            .replace('index2.html', config.webSockUrl);
+            .replace('index.html', config.webSockUrl);
     }
     }
 
 
     webSock = {
     webSock = {