Renaming OneWeb to DaylightWeb

Change-Id: Ic8f89bc249aadd81fec3416322122259ef51b89a
Signed-off-by: Colin Dixon <ckd@us.ibm.com>

diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
index 5be771af9636967e9e076de98bfc7b60a2895ab2..ece5959dc0256e6bdef294075161cf99d57c30cd 100644 (file)
--- a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
+++ b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
@@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.opendaylight.controller.usermanager.IUserManager;
-import org.opendaylight.controller.web.IOneWeb;
+import org.opendaylight.controller.web.IDaylightWeb;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,7 +48,7 @@ import com.google.gson.Gson;
 
 @Controller
 @RequestMapping("/")
-public class Devices implements IOneWeb {
+public class Devices implements IDaylightWeb {
     private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER;
     private final String WEB_NAME = "Devices";
     private final String WEB_ID = "devices";
@@ -56,7 +56,7 @@ public class Devices implements IOneWeb {
     private final String containerName = GlobalConstants.DEFAULT.toString();
 
     public Devices() {
-        ServiceHelper.registerGlobalService(IOneWeb.class, this, null);
+        ServiceHelper.registerGlobalService(IDaylightWeb.class, this, null);
     }
 
     @Override

diff --git a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java b/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java
index d75d14c623da8bb8c4d1331415f6988a2d8c35af..4cc35e2f92dccbfaac30e64cac28da7afb827cad 100644 (file)
--- a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java
+++ b/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java
@@ -29,7 +29,7 @@ import org.opendaylight.controller.switchmanager.ISwitchManager;
 import org.opendaylight.controller.switchmanager.Switch;
 import org.opendaylight.controller.switchmanager.SwitchConfig;
 import org.opendaylight.controller.usermanager.IUserManager;
-import org.opendaylight.controller.web.IOneWeb;
+import org.opendaylight.controller.web.IDaylightWeb;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -42,7 +42,7 @@ import com.google.gson.Gson;
 
 @Controller
 @RequestMapping("/")
-public class Flows implements IOneWeb {
+public class Flows implements IDaylightWeb {
        private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER;
     private static final String WEB_NAME = "Flows";
     private static final String WEB_ID = "flows";
@@ -50,7 +50,7 @@ public class Flows implements IOneWeb {
     private final String containerName = GlobalConstants.DEFAULT.toString();
 
     public Flows() {
-        ServiceHelper.registerGlobalService(IOneWeb.class, this, null);
+        ServiceHelper.registerGlobalService(IDaylightWeb.class, this, null);
     }
 
     @Override

diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/OneWeb.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java
similarity index 95%
rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/OneWeb.java
rename to opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java
index d1237c760e4c81add1dc3a064d34df0de14f0d0e..296a8fbbd6c684bc0c441b5b05900842d3e0c7ea 100644 (file)
--- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/OneWeb.java
+++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWeb.java
@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping("/")
-public class OneWeb {
+public class DaylightWeb {
     @RequestMapping(value = "")
     public String index(Model model) {
        IUserManager userManager = (IUserManager) ServiceHelper
@@ -48,15 +48,15 @@ public class OneWeb {
     @RequestMapping(value = "web.json")
     @ResponseBody
     public Map<String, Map<String, Object>> bundles() {
-        Object[] instances = ServiceHelper.getGlobalInstances(IOneWeb.class,
+        Object[] instances = ServiceHelper.getGlobalInstances(IDaylightWeb.class,
                 this, null);
         Map<String, Map<String, Object>> bundles = new HashMap<String, Map<String, Object>>();
         Map<String, Object> entry;
-        IOneWeb bundle;
+        IDaylightWeb bundle;
         String userName = SecurityContextHolder.getContext().getAuthentication().getName();
         IUserManager userManger = (IUserManager) ServiceHelper.getGlobalInstance(IUserManager.class, this);
         for (Object instance : instances) {
-            bundle = (IOneWeb) instance;
+            bundle = (IDaylightWeb) instance;
             if (userManger != null &&
                        bundle.isAuthorized(userManger.getUserLevel(userName))) {
                    entry = new HashMap<String, Object>();

diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/OneWebAdmin.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
similarity index 99%
rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/OneWebAdmin.java
rename to opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
index a22d749c5cdb038f60f71fb700c1cc93a9fc5820..bc3d39aa2124136f35602f0ffbcb78eb6f3de673 100644 (file)
--- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/OneWebAdmin.java
+++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/DaylightWebAdmin.java
@@ -28,7 +28,7 @@ import com.google.gson.Gson;
 
 @Controller
 @RequestMapping("/admin")
-public class OneWebAdmin {
+public class DaylightWebAdmin {
     @RequestMapping("/users")
     @ResponseBody
     public List<UserConfig> getUsers() {

diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IOneWeb.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java
similarity index 94%
rename from opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IOneWeb.java
rename to opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java
index 72a381229742e0810f82628ee37bd2db7445d826..84bbd94bae12b41654de7c906387a005db83896e 100644 (file)
--- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IOneWeb.java
+++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/IDaylightWeb.java
@@ -15,7 +15,7 @@ import org.opendaylight.controller.sal.authorization.UserLevel;
  *
  *
  */
-public interface IOneWeb {
+public interface IDaylightWeb {
     public String getWebName();
 
     public String getWebId();

diff --git a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java b/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
index a4083d162454938e63ffd53632fe81eb2fe217c4..903fa7b5d13499628f3683d3fe026374e3000d1c 100644 (file)
--- a/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
+++ b/opendaylight/web/troubleshoot/src/main/java/org/opendaylight/controller/troubleshoot/web/Troubleshoot.java
@@ -36,7 +36,7 @@ import org.opendaylight.controller.sal.utils.NetUtils;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.controller.statisticsmanager.IStatisticsManager;
 import org.opendaylight.controller.switchmanager.ISwitchManager;
-import org.opendaylight.controller.web.IOneWeb;
+import org.opendaylight.controller.web.IDaylightWeb;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping("/")
-public class Troubleshoot implements IOneWeb {
+public class Troubleshoot implements IDaylightWeb {
     private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER;
     private final String WEB_NAME = "Troubleshoot";
     private final String WEB_ID = "troubleshoot";
@@ -53,7 +53,7 @@ public class Troubleshoot implements IOneWeb {
     private final String containerName = GlobalConstants.DEFAULT.toString();
 
     public Troubleshoot() {
-        ServiceHelper.registerGlobalService(IOneWeb.class, this, null);
+        ServiceHelper.registerGlobalService(IDaylightWeb.class, this, null);
     }
 
     @Override