Consistent URL Scheme for Northbound and Web UI 00/100/1
authorMadhu Venugopal <vmadhu@cisco.com>
Wed, 3 Apr 2013 14:45:30 +0000 (07:45 -0700)
committerMadhu Venugopal <vmadhu@cisco.com>
Wed, 3 Apr 2013 14:45:30 +0000 (07:45 -0700)
Changing the URLs that is currently used to be more consistent and an added hierarchy : controller/nb, controller/web

Change-Id: Icd4f2f2ffcdfcd6d0439a8df4d556e3e5b56fb20
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
29 files changed:
opendaylight/northbound/flowprogrammer/enunciate.xml
opendaylight/northbound/flowprogrammer/pom.xml
opendaylight/northbound/hosttracker/enunciate.xml
opendaylight/northbound/hosttracker/pom.xml
opendaylight/northbound/staticrouting/enunciate.xml
opendaylight/northbound/staticrouting/pom.xml
opendaylight/northbound/statistics/enunciate.xml
opendaylight/northbound/statistics/pom.xml
opendaylight/northbound/subnets/enunciate.xml
opendaylight/northbound/subnets/pom.xml
opendaylight/northbound/switchmanager/enunciate.xml
opendaylight/northbound/switchmanager/pom.xml
opendaylight/northbound/topology/enunciate.xml
opendaylight/northbound/topology/pom.xml
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java
opendaylight/web/devices/pom.xml
opendaylight/web/devices/src/main/resources/WEB-INF/spring/servlet/security.xml
opendaylight/web/devices/src/main/resources/js/page.js
opendaylight/web/flows/pom.xml
opendaylight/web/flows/src/main/resources/WEB-INF/spring/servlet/security.xml
opendaylight/web/flows/src/main/resources/js/page.js
opendaylight/web/root/src/main/resources/WEB-INF/spring/servlet/security.xml
opendaylight/web/root/src/main/resources/js/one-topology.js
opendaylight/web/root/src/main/resources/js/one.js
opendaylight/web/topology/pom.xml
opendaylight/web/topology/src/main/resources/WEB-INF/spring/servlet/security.xml
opendaylight/web/troubleshoot/pom.xml
opendaylight/web/troubleshoot/src/main/resources/WEB-INF/spring/servlet/security.xml
opendaylight/web/troubleshoot/src/main/resources/js/page.js

index 7bff102..a49d9f8 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
   
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/flow"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/flow"/>
   </services>
 
   <modules>
index 14a77ae..c0f03ed 100644 (file)
@@ -58,7 +58,7 @@
             </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/one/nb/v2/flow</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/flow</Web-ContextPath>
           </instructions>
         </configuration>
       </plugin>
index 43a01e5..8f0d7e6 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
   
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/host"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/host"/>
   </services>
 
   <modules>
index 297f699..4cb9919 100644 (file)
@@ -59,7 +59,7 @@
               org.slf4j,
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
-            <Web-ContextPath>/one/nb/v2/host</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/host</Web-ContextPath>
           </instructions>
         </configuration>
       </plugin>
index b79b3e8..4d6bed0 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
   
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/staticroute"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/staticroute"/>
   </services>
 
   <modules>
index 7382d9d..c35c5e6 100644 (file)
@@ -60,7 +60,7 @@
             </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/one/nb/v2/staticroute</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/staticroute</Web-ContextPath>
           </instructions>
         </configuration>
       </plugin>
index 422ebda..3f2759d 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
   
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/statistics"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/statistics"/>
   </services>
 
   <modules>
index a40c201..b3fe26f 100644 (file)
@@ -68,7 +68,7 @@
             </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/one/nb/v2/statistics</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/statistics</Web-ContextPath>
           </instructions>
         </configuration>
       </plugin>
index 275e4d0..5ff13ff 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
 
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/subnet"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/subnet"/>
   </services>
 
   <modules>
index 9efdabe..aa18909 100644 (file)
@@ -74,7 +74,7 @@
             </Import-Package>
             <Export-Package>
             </Export-Package>
-            <Web-ContextPath>/one/nb/v2/subnet</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/subnet</Web-ContextPath>
           </instructions>
         </configuration>
       </plugin>
index 5f8f9c9..9338b55 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
   
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/switch"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/switch"/>
   </services>
 
   <modules>
index 55c836d..4a8504b 100644 (file)
@@ -59,7 +59,7 @@
               org.slf4j,
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
-            <Web-ContextPath>/one/nb/v2/switch</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/switch</Web-ContextPath>
           </instructions>
         </configuration>
       </plugin>
index 7103df9..c955d8c 100644 (file)
@@ -3,7 +3,7 @@
     xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd">
   
   <services>
-    <rest defaultRestSubcontext="/one/nb/v2/topology"/>
+    <rest defaultRestSubcontext="/controller/nb/v2/topology"/>
   </services>
 
   <modules>
index c6963b8..82eaf4e 100644 (file)
@@ -61,7 +61,7 @@
               org.springframework.security.web.authentication.www,
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
-            <Web-ContextPath>/one/nb/v2/topology</Web-ContextPath>
+            <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
           </instructions>
           </configuration>
       </plugin>
index abc0c23..6f60a52 100644 (file)
@@ -14,9 +14,12 @@ package org.opendaylight.controller.sal.utils;
  *
  */
 public enum GlobalConstants {
-    DEFAULT("default"), CONTAINERMANAGER("containermanager"), CONTAINERNAME(
-            "name"), STATICVLAN("staticvlan"), CLUSTERINGSERVICES("clusteringservices"), ONECONTROLLER(
-            "onecontroller"), STARTUPHOME("configuration/startup/");
+    DEFAULT("default"), 
+    CONTAINERMANAGER("containermanager"), 
+    CONTAINERNAME("name"), 
+    STATICVLAN("staticvlan"), 
+    CLUSTERINGSERVICES("clusteringservices"), 
+    STARTUPHOME("configuration/startup/");
 
     private GlobalConstants(String name) {
         this.name = name;
index 00360c3..3500cd2 100644 (file)
@@ -94,7 +94,7 @@
                                                        org.springframework.security.web.authentication.logout,
                                                        org.springframework.dao
                                                </Import-Package>
-                                               <Web-ContextPath>/one/devices</Web-ContextPath>
+                                               <Web-ContextPath>/controller/web/devices</Web-ContextPath>
                                        </instructions>
                                </configuration>
                        </plugin>
index 641042c..18ac6e7 100644 (file)
@@ -10,9 +10,9 @@
        <http pattern="/js/**" security="none" />
        <http pattern="/images/**" security="none" />
        <http pattern="/favicon.ico" security="none" />
-       <http pattern="/one/css/**" security="none" />
-       <http pattern="/one/js/**" security="none" />
-       <http pattern="/one/images/**" security="none" />
+       <http pattern="/controller/web/css/**" security="none" />
+       <http pattern="/controller/web/js/**" security="none" />
+       <http pattern="/controller/web/images/**" security="none" />
 
 
        <http auto-config="false" authentication-manager-ref="authenticationManager"
index 57ca7b3..d21f8d8 100644 (file)
@@ -50,7 +50,7 @@ one.f.menu = {
 
 /**Devices Modules */
 one.f.switchmanager = {
-       rootUrl: "one/devices",
+       rootUrl: "controller/web/devices",
        createTable: function(columnNames, body) {
                var tableAttributes = ["table-striped", "table-bordered", "table-condensed"];
                var $table = one.lib.dashlet.table.table(tableAttributes);
index 62c8922..891f951 100644 (file)
@@ -94,7 +94,7 @@
                                                        org.springframework.security.web.authentication.logout,
                                                        org.springframework.dao\r
                                                </Import-Package>
-                                               <Web-ContextPath>/one/flows</Web-ContextPath>
+                                               <Web-ContextPath>/controller/web/flows</Web-ContextPath>
                                        </instructions>
                                </configuration>
                        </plugin>
index 641042c..18ac6e7 100644 (file)
@@ -10,9 +10,9 @@
        <http pattern="/js/**" security="none" />
        <http pattern="/images/**" security="none" />
        <http pattern="/favicon.ico" security="none" />
-       <http pattern="/one/css/**" security="none" />
-       <http pattern="/one/js/**" security="none" />
-       <http pattern="/one/images/**" security="none" />
+       <http pattern="/controller/web/css/**" security="none" />
+       <http pattern="/controller/web/js/**" security="none" />
+       <http pattern="/controller/web/images/**" security="none" />
 
 
        <http auto-config="false" authentication-manager-ref="authenticationManager"
index 13884fb..c24b9d1 100644 (file)
@@ -44,7 +44,7 @@ one.f.menu = {
 };
 
 one.f.address = {
-    root : "/one/flows",
+    root : "/controller/web/flows",
     flows : {
         main : "/main",
                flows : "/node-flows",
index 641042c..18ac6e7 100644 (file)
@@ -10,9 +10,9 @@
        <http pattern="/js/**" security="none" />
        <http pattern="/images/**" security="none" />
        <http pattern="/favicon.ico" security="none" />
-       <http pattern="/one/css/**" security="none" />
-       <http pattern="/one/js/**" security="none" />
-       <http pattern="/one/images/**" security="none" />
+       <http pattern="/controller/web/css/**" security="none" />
+       <http pattern="/controller/web/js/**" security="none" />
+       <http pattern="/controller/web/images/**" security="none" />
 
 
        <http auto-config="false" authentication-manager-ref="authenticationManager"
index df36ea4..fc06a8c 100644 (file)
@@ -134,7 +134,7 @@ one.topology.init = function(json) {
                                var data = {};
                                data['x'] = ps.x;
                                data['y'] = ps.y;
-                               $.post('/one/topology/node/' + did, data);
+                               $.post('/controller/web/topology/node/' + did, data);
                        },
                        onClick: function(node, eventInfo, e) {
                                return false;
@@ -207,12 +207,12 @@ one.topology.init = function(json) {
 
 one.topology.update = function() {
        $('#topology').empty();
-       $.getJSON(one.global.remoteAddress+"one/topology/visual.json", function(data) {
+       $.getJSON(one.global.remoteAddress+"controller/web/topology/visual.json", function(data) {
                one.topology.init(data);
        });
 }
 
 /** INIT */
-$.getJSON(one.global.remoteAddress+"one/topology/visual.json", function(data) {
+$.getJSON(one.global.remoteAddress+"controller/web/topology/visual.json", function(data) {
        one.topology.init(data);
 });
\ No newline at end of file
index d582a9d..b996e73 100644 (file)
@@ -290,7 +290,7 @@ one.main = {};
 one.main.constants = {
     address : {
         menu : "/web.json",
-        prefix : "/one",
+        prefix : "/controller/web",
         save : "/save"
     }
 }
index f453358..daef22c 100644 (file)
@@ -97,7 +97,7 @@
                                                        org.springframework.security.web.authentication.logout,
                                                        org.springframework.dao
                                                </Import-Package>
-                                               <Web-ContextPath>/one/topology</Web-ContextPath>
+                                               <Web-ContextPath>/controller/web/topology</Web-ContextPath>
                                        </instructions>
                                </configuration>
                        </plugin>
index 56302de..6ddae01 100644 (file)
@@ -10,9 +10,9 @@
        <http pattern="/js/**" security="none" />
        <http pattern="/images/**" security="none" />
        <http pattern="/favicon.ico" security="none" />
-       <http pattern="/one/css/**" security="none" />
-       <http pattern="/one/js/**" security="none" />
-       <http pattern="/one/images/**" security="none" />
+       <http pattern="/controller/web/css/**" security="none" />
+       <http pattern="/controller/web/js/**" security="none" />
+       <http pattern="/controller/web/images/**" security="none" />
 
 
        <http auto-config="false" authentication-manager-ref="authenticationManager"
index 0fa2dda..8aab6d5 100644 (file)
@@ -96,7 +96,7 @@
                                                        org.springframework.security.web.authentication.logout,
                                                        org.springframework.dao
                                                </Import-Package>
-                                               <Web-ContextPath>/one/troubleshoot</Web-ContextPath>
+                                               <Web-ContextPath>/controller/web/troubleshoot</Web-ContextPath>
                                        </instructions>
                                </configuration>
                        </plugin>
index 641042c..18ac6e7 100644 (file)
@@ -10,9 +10,9 @@
        <http pattern="/js/**" security="none" />
        <http pattern="/images/**" security="none" />
        <http pattern="/favicon.ico" security="none" />
-       <http pattern="/one/css/**" security="none" />
-       <http pattern="/one/js/**" security="none" />
-       <http pattern="/one/images/**" security="none" />
+       <http pattern="/controller/web/css/**" security="none" />
+       <http pattern="/controller/web/js/**" security="none" />
+       <http pattern="/controller/web/images/**" security="none" />
 
 
        <http auto-config="false" authentication-manager-ref="authenticationManager"
index dba8477..e258b40 100644 (file)
@@ -63,7 +63,7 @@ $(one.f.menu.right.bottom).each(function(index, value) {
 
 /**Troubleshoot modules*/
 one.f.troubleshooting = {
-       rootUrl: "/one/troubleshoot",
+       rootUrl: "/controller/web/troubleshoot",
        rightBottomDashlet: { 
                get: function() {
                        var $rightBottomDashlet = $("#right-bottom").find(".dashlet");