From 707266e0c0b609e193e92421c760ed4ac0b35bd3 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Wed, 3 Apr 2013 07:45:30 -0700 Subject: [PATCH] Consistent URL Scheme for Northbound and Web UI 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 --- opendaylight/northbound/flowprogrammer/enunciate.xml | 2 +- opendaylight/northbound/flowprogrammer/pom.xml | 2 +- opendaylight/northbound/hosttracker/enunciate.xml | 2 +- opendaylight/northbound/hosttracker/pom.xml | 2 +- opendaylight/northbound/staticrouting/enunciate.xml | 2 +- opendaylight/northbound/staticrouting/pom.xml | 2 +- opendaylight/northbound/statistics/enunciate.xml | 2 +- opendaylight/northbound/statistics/pom.xml | 2 +- opendaylight/northbound/subnets/enunciate.xml | 2 +- opendaylight/northbound/subnets/pom.xml | 2 +- opendaylight/northbound/switchmanager/enunciate.xml | 2 +- opendaylight/northbound/switchmanager/pom.xml | 2 +- opendaylight/northbound/topology/enunciate.xml | 2 +- opendaylight/northbound/topology/pom.xml | 2 +- .../controller/sal/utils/GlobalConstants.java | 9 ++++++--- opendaylight/web/devices/pom.xml | 2 +- .../main/resources/WEB-INF/spring/servlet/security.xml | 6 +++--- opendaylight/web/devices/src/main/resources/js/page.js | 2 +- opendaylight/web/flows/pom.xml | 2 +- .../main/resources/WEB-INF/spring/servlet/security.xml | 6 +++--- opendaylight/web/flows/src/main/resources/js/page.js | 2 +- .../main/resources/WEB-INF/spring/servlet/security.xml | 6 +++--- .../web/root/src/main/resources/js/one-topology.js | 6 +++--- opendaylight/web/root/src/main/resources/js/one.js | 2 +- opendaylight/web/topology/pom.xml | 2 +- .../main/resources/WEB-INF/spring/servlet/security.xml | 6 +++--- opendaylight/web/troubleshoot/pom.xml | 2 +- .../main/resources/WEB-INF/spring/servlet/security.xml | 6 +++--- .../web/troubleshoot/src/main/resources/js/page.js | 2 +- 29 files changed, 46 insertions(+), 43 deletions(-) diff --git a/opendaylight/northbound/flowprogrammer/enunciate.xml b/opendaylight/northbound/flowprogrammer/enunciate.xml index 7bff1021b3..a49d9f8265 100644 --- a/opendaylight/northbound/flowprogrammer/enunciate.xml +++ b/opendaylight/northbound/flowprogrammer/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index 14a77ae53d..c0f03edf5c 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -58,7 +58,7 @@ - /one/nb/v2/flow + /controller/nb/v2/flow diff --git a/opendaylight/northbound/hosttracker/enunciate.xml b/opendaylight/northbound/hosttracker/enunciate.xml index 43a01e5a33..8f0d7e6ab8 100644 --- a/opendaylight/northbound/hosttracker/enunciate.xml +++ b/opendaylight/northbound/hosttracker/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 297f699efb..4cb9919b9c 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -59,7 +59,7 @@ org.slf4j, !org.codehaus.enunciate.jaxrs - /one/nb/v2/host + /controller/nb/v2/host diff --git a/opendaylight/northbound/staticrouting/enunciate.xml b/opendaylight/northbound/staticrouting/enunciate.xml index b79b3e8c96..4d6bed028a 100644 --- a/opendaylight/northbound/staticrouting/enunciate.xml +++ b/opendaylight/northbound/staticrouting/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index 7382d9d986..c35c5e6220 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -60,7 +60,7 @@ - /one/nb/v2/staticroute + /controller/nb/v2/staticroute diff --git a/opendaylight/northbound/statistics/enunciate.xml b/opendaylight/northbound/statistics/enunciate.xml index 422ebda816..3f2759dcea 100644 --- a/opendaylight/northbound/statistics/enunciate.xml +++ b/opendaylight/northbound/statistics/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index a40c201379..b3fe26f6a0 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -68,7 +68,7 @@ - /one/nb/v2/statistics + /controller/nb/v2/statistics diff --git a/opendaylight/northbound/subnets/enunciate.xml b/opendaylight/northbound/subnets/enunciate.xml index 275e4d0a32..5ff13ffe80 100644 --- a/opendaylight/northbound/subnets/enunciate.xml +++ b/opendaylight/northbound/subnets/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index 9efdabe161..aa18909f48 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -74,7 +74,7 @@ - /one/nb/v2/subnet + /controller/nb/v2/subnet diff --git a/opendaylight/northbound/switchmanager/enunciate.xml b/opendaylight/northbound/switchmanager/enunciate.xml index 5f8f9c9411..9338b55826 100644 --- a/opendaylight/northbound/switchmanager/enunciate.xml +++ b/opendaylight/northbound/switchmanager/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index 55c836d2f4..4a8504bef0 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -59,7 +59,7 @@ org.slf4j, !org.codehaus.enunciate.jaxrs - /one/nb/v2/switch + /controller/nb/v2/switch diff --git a/opendaylight/northbound/topology/enunciate.xml b/opendaylight/northbound/topology/enunciate.xml index 7103df953e..c955d8cc5c 100644 --- a/opendaylight/northbound/topology/enunciate.xml +++ b/opendaylight/northbound/topology/enunciate.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.26.xsd"> - + diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index c6963b8a7e..82eaf4e580 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -61,7 +61,7 @@ org.springframework.security.web.authentication.www, !org.codehaus.enunciate.jaxrs - /one/nb/v2/topology + /controller/nb/v2/topology diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java index abc0c23ae9..6f60a522fd 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/GlobalConstants.java @@ -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; diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index 00360c3e2b..3500cd2eaf 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -94,7 +94,7 @@ org.springframework.security.web.authentication.logout, org.springframework.dao - /one/devices + /controller/web/devices diff --git a/opendaylight/web/devices/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/web/devices/src/main/resources/WEB-INF/spring/servlet/security.xml index 641042c53f..18ac6e7ecb 100644 --- a/opendaylight/web/devices/src/main/resources/WEB-INF/spring/servlet/security.xml +++ b/opendaylight/web/devices/src/main/resources/WEB-INF/spring/servlet/security.xml @@ -10,9 +10,9 @@ - - - + + + - /one/flows + /controller/web/flows diff --git a/opendaylight/web/flows/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/web/flows/src/main/resources/WEB-INF/spring/servlet/security.xml index 641042c53f..18ac6e7ecb 100644 --- a/opendaylight/web/flows/src/main/resources/WEB-INF/spring/servlet/security.xml +++ b/opendaylight/web/flows/src/main/resources/WEB-INF/spring/servlet/security.xml @@ -10,9 +10,9 @@ - - - + + + - - - + + + - /one/topology + /controller/web/topology diff --git a/opendaylight/web/topology/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/web/topology/src/main/resources/WEB-INF/spring/servlet/security.xml index 56302def77..6ddae0119b 100644 --- a/opendaylight/web/topology/src/main/resources/WEB-INF/spring/servlet/security.xml +++ b/opendaylight/web/topology/src/main/resources/WEB-INF/spring/servlet/security.xml @@ -10,9 +10,9 @@ - - - + + + - /one/troubleshoot + /controller/web/troubleshoot diff --git a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/spring/servlet/security.xml index 641042c53f..18ac6e7ecb 100644 --- a/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/spring/servlet/security.xml +++ b/opendaylight/web/troubleshoot/src/main/resources/WEB-INF/spring/servlet/security.xml @@ -10,9 +10,9 @@ - - - + + +