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 7bff1021b3905ce3170bb4f89ca01f84c3e6a89d..a49d9f8265f4b0a9da8b24387a4a9d58337997f9 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 14a77ae53daa8f375711072bc72baa44a62bdeba..c0f03edf5c11a1685b207ca874da5ad3e9b56ce7 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 43a01e5a33cbfcf64fbf1518037137ab7fae2bb8..8f0d7e6ab8f9b5a865d4d0b5eabbc2e6c3220ae8 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 297f699efb30f08a62913a39cec58d2311710669..4cb9919b9c771a60d81418898f7f2b53c29b81a8 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 b79b3e8c96c04123ec10beeb3909cbbf55ac54ed..4d6bed028a0fc3d30ff0ab932c9552af4409f902 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 7382d9d9869577b74c40c425c38d26c30b3fa7d4..c35c5e622089c71bba297d9fa0142806e843b93c 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 422ebda816481e0439878311703ee2300f45c8ac..3f2759dceaa37641f4fac291417bb58949c5e787 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 a40c201379fb2f464a319ae91c2de571a02d4c51..b3fe26f6a06ea884af140754561ea5c6c9d782c9 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 275e4d0a32883e4acd83ded755c3d891eba9f559..5ff13ffe805381e9abc83a08a71e67ae0eaaf6c5 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 9efdabe16135882223b9334fac4e9a0f3ab00a25..aa18909f48af4a7681977d0e8cb09cc061fb932b 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 5f8f9c941189fd515d714dd252b4f06dec11c5d1..9338b55826b81852f4c0c881fe7beaa49bdc0298 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 55c836d2f436048d44f67a085390c48ef6d80b22..4a8504bef09ac2918fb64325bae1fe01c2f81609 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 7103df953e2ed1bbb50b566bc2a2bd807ea55316..c955d8cc5c3ae549f7ff021db27d02ddaf9f8fd6 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 c6963b8a7e2831e9df7a937c0ca57ff7c3503127..82eaf4e580f3096bc7565be0da45bee45ad28329 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 abc0c23ae93861ef21035b165db97f8e54e03cab..6f60a522fdb5ba5780dc5034c9be45efee931528 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 00360c3e2b7ab637594bc16d8b0b9ca153091df0..3500cd2eafa662b3c218ae5023990d5fda42867e 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 641042c53f76dc51768248d714cac5c8a43b2c36..18ac6e7ecb1cc84d7f3b85ecbb74207a713382a5 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 57ca7b3f8186c046533b34c975abfda37b71befc..d21f8d83a79d2d9ec52ca365289dc8d442b5bc6d 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 62c8922eadedc851a9c25c57a61db8ef5b61bbe0..891f951f503f8781fe15f3056136b461d9112ef2 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 641042c53f76dc51768248d714cac5c8a43b2c36..18ac6e7ecb1cc84d7f3b85ecbb74207a713382a5 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 13884fbb8387f426de7f73010e0072291ec70cd2..c24b9d1346e6f172beedf386e82008c073f3a58c 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 641042c53f76dc51768248d714cac5c8a43b2c36..18ac6e7ecb1cc84d7f3b85ecbb74207a713382a5 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 df36ea4b572229117927f61bb569fa800ad470ca..fc06a8c9882ec2e20aec2c75563a10ceda3422e4 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 d582a9da56b3a30ee19ae9e5aa580e3f98b44b50..b996e732332af1d821b6e92c28ab6f4f6d993484 100644 (file)
@@ -290,7 +290,7 @@ one.main = {};
 one.main.constants = {
     address : {
         menu : "/web.json",
-        prefix : "/one",
+        prefix : "/controller/web",
         save : "/save"
     }
 }
index f4533588ecc2363e346e94c3c9d3e514201f5482..daef22cf23675ef4b1e1d27bbd07d5aab3ce6187 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 56302def77247de9d498bd8524f58e7086563bc7..6ddae0119bd6f962003c2e411ea7beaaa88d2558 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 0fa2ddac9af628f5cf744eeae562e1ba095efaf6..8aab6d5fb781e5b5c6e3032b1ac9b172ddda7c3d 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 641042c53f76dc51768248d714cac5c8a43b2c36..18ac6e7ecb1cc84d7f3b85ecbb74207a713382a5 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 dba84771f00d9b8ab1c8af7fc34e42b1d0c075f2..e258b4003e18c091805aaee58effaa08f23f66ea 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");