Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Device.java

@@ -21,6 +21,7 @@ package org.wso2.carbon.device.mgt.jaxrs.api;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementAdminService;
 import org.wso2.carbon.device.mgt.jaxrs.api.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.jaxrs.api.util.ResponsePayload;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
@@ -30,7 +31,9 @@ import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -231,4 +234,52 @@ public class Device {
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
         }
     }
+
+    /**
+     * Update device.
+     *
+     * @return update status.
+     */
+    @PUT
+    @Path("type/{type}/id/{deviceId}")
+    public Response updateDevice(@PathParam("type") String deviceType, @PathParam("deviceId") String deviceId,
+                                 org.wso2.carbon.device.mgt.common.Device updatedDevice) {
+        try {
+            DeviceManagementProviderService deviceManagementService = DeviceMgtAPIUtils.getDeviceManagementService();
+            DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
+            deviceIdentifier.setType(deviceType);
+            deviceIdentifier.setId(deviceId);
+            org.wso2.carbon.device.mgt.common.Device device = deviceManagementService.getDevice(deviceIdentifier);
+            device.setName(updatedDevice.getName());
+            device.setDescription(updatedDevice.getDescription());
+            Boolean response = deviceManagementService.modifyEnrollment(device);
+            return Response.status(Response.Status.OK).entity(response).build();
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while fetching the list of device types.";
+            log.error(msg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        }
+    }
+
+    /**
+     * disenroll device.
+     *
+     * @return disenrollment status.
+     */
+    @DELETE
+    @Path("type/{type}/id/{deviceId}")
+    public Response disenrollDevice(@PathParam("type") String deviceType, @PathParam("deviceId") String deviceId) {
+        try {
+            DeviceManagementProviderService deviceManagementService = DeviceMgtAPIUtils.getDeviceManagementService();
+            DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
+            deviceIdentifier.setType(deviceType);
+            deviceIdentifier.setId(deviceId);
+            Boolean response = deviceManagementService.disenrollDevice(deviceIdentifier);
+            return Response.status(Response.Status.OK).entity(response).build();
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while fetching the list of device types.";
+            log.error(msg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        }
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Policy.java

@@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.jaxrs.api.common.MDMAPIException;
 import org.wso2.carbon.device.mgt.jaxrs.api.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PriorityUpdatedPolicyWrapper;
-import org.wso2.carbon.device.mgt.jaxrs.util.MDMUtil;
+import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtUtil;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.jaxrs.api.util.ResponsePayload;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PolicyWrapper;
@@ -62,7 +62,7 @@ public class Policy {
         policy.setPolicyName(policyWrapper.getPolicyName());
         policy.setProfileId(policyWrapper.getProfileId());
 	    policy.setDescription(policyWrapper.getDescription());
-        policy.setProfile(MDMUtil.convertProfile(policyWrapper.getProfile()));
+        policy.setProfile(DeviceMgtUtil.convertProfile(policyWrapper.getProfile()));
         policy.setOwnershipType(policyWrapper.getOwnershipType());
         policy.setRoles(policyWrapper.getRoles());
         policy.setUsers(policyWrapper.getUsers());
@@ -82,7 +82,7 @@ public class Policy {
         policy.setPolicyName(policyWrapper.getPolicyName());
         policy.setProfileId(policyWrapper.getProfileId());
 	    policy.setDescription(policyWrapper.getDescription());
-        policy.setProfile(MDMUtil.convertProfile(policyWrapper.getProfile()));
+        policy.setProfile(DeviceMgtUtil.convertProfile(policyWrapper.getProfile()));
         policy.setOwnershipType(policyWrapper.getOwnershipType());
         policy.setRoles(policyWrapper.getRoles());
         policy.setUsers(policyWrapper.getUsers());
@@ -181,7 +181,7 @@ public class Policy {
         policy.setId(policyId);
         policy.setProfileId(policyWrapper.getProfileId());
         policy.setDescription(policyWrapper.getDescription());
-        policy.setProfile(MDMUtil.convertProfile(policyWrapper.getProfile()));
+        policy.setProfile(DeviceMgtUtil.convertProfile(policyWrapper.getProfile()));
         policy.setOwnershipType(policyWrapper.getOwnershipType());
         policy.setRoles(policyWrapper.getRoles());
         policy.setUsers(policyWrapper.getUsers());

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtUtil.java

@@ -24,7 +24,7 @@ import org.wso2.carbon.policy.mgt.common.Profile;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MDMUtil {
+public class DeviceMgtUtil {
 
     public static Profile convertProfile(org.wso2.carbon.device.mgt.jaxrs.beans.Profile mdmProfile) {
         Profile profile = new Profile();

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml

@@ -206,6 +206,20 @@
         <method>GET</method>
     </Permission>
 
+    <Permission>
+        <name>Modify user device</name>
+        <path>/device-mgt/user/devices/update</path>
+        <url>/devices/type/*/id/*</url>
+        <method>PUT</method>
+    </Permission>
+
+    <Permission>
+        <name>Remove user device</name>
+        <path>/device-mgt/user/devices/remove</path>
+        <url>/devices/type/*/id/*</url>
+        <method>DELETE</method>
+    </Permission>
+
     <!--<Permission>-->
         <!--<name>Get device</name>-->
         <!--<path>/device-mgt/devices/view</path>-->
@@ -241,6 +255,13 @@
         <url>/devices/name/*/*</url>
         <method>GET</method>
     </Permission>
+
+    <Permission>
+        <name>List All Own Devices</name>
+        <path>/device-mgt/user/devices/list</path>
+        <url>/devices/user/*</url>
+        <method>GET</method>
+    </Permission>
     <!-- End of Device related APIs -->
 
     <!-- Notification related APIs -->

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/ProvisioningConfig.java

@@ -0,0 +1,39 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.common;
+
+public class ProvisioningConfig {
+
+    private String providerTenantDomain;
+    private boolean isSharedWithAllTenants;
+
+    public ProvisioningConfig(String providerTenantDomain, boolean sharedWithAllTenants) {
+        this.providerTenantDomain = providerTenantDomain;
+        isSharedWithAllTenants = sharedWithAllTenants;
+    }
+
+    public String getProviderTenantDomain() {
+        return providerTenantDomain;
+    }
+
+    public boolean isSharedWithAllTenants() {
+        return isSharedWithAllTenants;
+    }
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/PushNotificationConfig.java

@@ -0,0 +1,41 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.common.push.notification;
+
+import java.util.Set;
+
+public class PushNotificationConfig {
+
+    private String type;
+    private Set<String> properties;
+
+    public PushNotificationConfig(String type, Set<String> properties) {
+        this.type = type;
+        this.properties = properties;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public Set<String> getProperties() {
+        return properties;
+    }
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagementService.java

@@ -18,13 +18,11 @@
  */
 package org.wso2.carbon.device.mgt.common.spi;
 
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
+import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
-
-import java.util.List;
 
 /**
  * Composite interface that acts as the SPI exposing all device management as well as application management
@@ -32,33 +30,16 @@ import java.util.List;
  */
 public interface DeviceManagementService {
 
-    /**
-     * Method to retrieve the provider type that implements DeviceManager interface.
-     *
-     * @return Returns provider type
-     */
-    String getType();
-
-    /**
-     * This returns the tenant domain of the provider.
-     * @return
-     */
-    String getProviderTenantDomain();
-
-    /**
-     * returns true if the device type is shared between all tenants and false if its not.
-     *
-     * @return
-     */
-    boolean isSharedWithAllTenants();
-
     void init() throws DeviceManagementException;
 
+    String getType();
+
     DeviceManager getDeviceManager();
 
     ApplicationManager getApplicationManager();
 
-    void notifyOperationToDevices(Operation operation,
+    ProvisioningConfig getProvisioningConfig();
-                                  List<DeviceIdentifier> deviceIds) throws DeviceManagementException;
+
+    PushNotificationConfig getPushNotificationConfig();
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java

@@ -21,6 +21,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceTypeIdentifier;
+import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
@@ -44,8 +45,10 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
 
     public void addDeviceManagementProvider(DeviceManagementService provider) throws DeviceManagementException {
         String deviceType = provider.getType();
-        String tenantDomain = provider.getProviderTenantDomain();
+
-        boolean isSharedWithAllTenants = provider.isSharedWithAllTenants();
+        ProvisioningConfig provisioningConfig = provider.getProvisioningConfig();
+        String tenantDomain = provisioningConfig.getProviderTenantDomain();
+        boolean isSharedWithAllTenants = provisioningConfig.isSharedWithAllTenants();
         int tenantId = DeviceManagerUtil.getTenantId(tenantDomain);
         if (tenantId == -1) {
             throw new DeviceManagementException("No tenant available for tenant domain " + tenantDomain);
@@ -57,7 +60,7 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
                     provider.init();
                     DeviceManagerUtil.registerDeviceType(deviceType, tenantId, isSharedWithAllTenants);
                     DeviceManagementDataHolder.getInstance().setRequireDeviceAuthorization(deviceType,
-                                                            provider.getDeviceManager().requireDeviceAuthorization());
+                            provider.getDeviceManager().requireDeviceAuthorization());
 
                 }
             } catch (DeviceManagementException e) {
@@ -75,13 +78,15 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
     }
 
     public void removeDeviceManagementProvider(DeviceManagementService provider) throws DeviceManagementException {
-        String deviceTypeName=provider.getType();
+        String deviceTypeName = provider.getType();
-        if(provider.isSharedWithAllTenants()){
+
-            DeviceTypeIdentifier deviceTypeIdentifier =new DeviceTypeIdentifier(deviceTypeName);
+        ProvisioningConfig provisioningConfig = provider.getProvisioningConfig();
+        if (provisioningConfig.isSharedWithAllTenants()) {
+            DeviceTypeIdentifier deviceTypeIdentifier = new DeviceTypeIdentifier(deviceTypeName);
             providers.remove(deviceTypeIdentifier);
-        }else{
+        } else {
-            int providerTenantId=DeviceManagerUtil.getTenantId(provider.getProviderTenantDomain());
+            int providerTenantId = DeviceManagerUtil.getTenantId(provisioningConfig.getProviderTenantDomain());
-            DeviceTypeIdentifier deviceTypeIdentifier =new DeviceTypeIdentifier(deviceTypeName, providerTenantId);
+            DeviceTypeIdentifier deviceTypeIdentifier = new DeviceTypeIdentifier(deviceTypeName, providerTenantId);
             providers.remove(deviceTypeIdentifier);
         }
     }
@@ -113,15 +118,17 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
             for (DeviceManagementService provider : providers.values()) {
                 try {
                     provider.init();
-                    int tenantId=DeviceManagerUtil.getTenantId(provider.getProviderTenantDomain());
+
-                    DeviceManagerUtil.registerDeviceType(provider.getType(), tenantId, provider.isSharedWithAllTenants());
+                    ProvisioningConfig provisioningConfig = provider.getProvisioningConfig();
+                    int tenantId = DeviceManagerUtil.getTenantId(provisioningConfig.getProviderTenantDomain());
+                    DeviceManagerUtil.registerDeviceType(provider.getType(), tenantId, provisioningConfig.isSharedWithAllTenants());
                     //TODO:
                     //This is a temporory fix.
                     //windows and IOS cannot resolve user info by extracting certs
                     //until fix that, use following variable to enable and disable of checking user authorization.
 
                     DeviceManagementDataHolder.getInstance().setRequireDeviceAuthorization(provider.getType(),
-                                             provider.getDeviceManager().requireDeviceAuthorization());
+                            provider.getDeviceManager().requireDeviceAuthorization());
                 } catch (Throwable e) {
                     /* Throwable is caught intentionally as failure of one plugin - due to invalid start up parameters,
                         etc - should not block the initialization of other device management providers */

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java

@@ -32,16 +32,13 @@ import org.wso2.carbon.device.mgt.common.app.mgt.Application;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.core.DeviceManagementPluginRepository;
 import org.wso2.carbon.device.mgt.core.app.mgt.config.AppManagementConfig;
 import org.wso2.carbon.device.mgt.core.app.mgt.oauth.ServiceAuthenticator;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.identity.IdentityConfigurations;
 import org.wso2.carbon.device.mgt.core.dao.*;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.internal.PluginInitializationListener;
 import org.wso2.carbon.identity.oauth.stub.OAuthAdminServiceException;
 import org.wso2.carbon.identity.oauth.stub.OAuthAdminServiceStub;
 import org.wso2.carbon.identity.oauth.stub.dto.OAuthConsumerAppDTO;
@@ -56,9 +53,6 @@ import java.util.List;
  */
 public class ApplicationManagerProviderServiceImpl implements ApplicationManagementProviderService {
 
-    private ConfigurationContext configCtx;
-    private ServiceAuthenticator authenticator;
-    private String oAuthAdminServiceUrl;
     private DeviceDAO deviceDAO;
     private ApplicationDAO applicationDAO;
     private ApplicationMappingDAO applicationMappingDAO;
@@ -67,19 +61,6 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
     private static final Log log = LogFactory.getLog(ApplicationManagerProviderServiceImpl.class);
 
     public ApplicationManagerProviderServiceImpl(AppManagementConfig appManagementConfig) {
-
-        IdentityConfigurations identityConfig = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
-                getDeviceManagementConfigRepository().getIdentityConfigurations();
-        this.authenticator =
-                new ServiceAuthenticator(identityConfig.getAdminUsername(), identityConfig.getAdminPassword());
-        this.oAuthAdminServiceUrl =
-                identityConfig.getServerUrl() + DeviceManagementConstants.AppManagement.OAUTH_ADMIN_SERVICE;
-        try {
-            this.configCtx = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
-        } catch (AxisFault e) {
-            throw new IllegalArgumentException("Error occurred while initializing Axis2 Configuration Context. " +
-                    "Please check if an appropriate axis2.xml is provided", e);
-        }
         this.deviceDAO = DeviceManagementDAOFactory.getDeviceDAO();
         this.applicationDAO = DeviceManagementDAOFactory.getApplicationDAO();
         this.applicationMappingDAO = DeviceManagementDAOFactory.getApplicationMappingDAO();
@@ -112,7 +93,6 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
     @Override
     public void installApplicationForDevices(Operation operation, List<DeviceIdentifier> deviceIds)
             throws ApplicationManagementException {
-
         try {
             DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().addOperation(operation, deviceIds);
             DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().notifyOperationToDevices
@@ -207,50 +187,6 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
         }
     }
 
-    public void updateInstalledApplicationListOfDevice(
-            DeviceIdentifier deviceIdentifier, List<Application> applications) throws ApplicationManagementException {
-    }
-
-    private OAuthConsumerAppDTO getAppInfo() throws ApplicationManagementException {
-        OAuthConsumerAppDTO appInfo = null;
-        try {
-            OAuthAdminServiceStub oAuthAdminServiceStub =
-                    new OAuthAdminServiceStub(configCtx, oAuthAdminServiceUrl);
-            authenticator.authenticate(oAuthAdminServiceStub._getServiceClient());
-
-            try {
-                appInfo = oAuthAdminServiceStub.getOAuthApplicationDataByAppName(
-                        DeviceManagementConstants.AppManagement.OAUTH_APPLICATION_NAME);
-            }
-            //application doesn't exist. Due to the way getOAuthApplicationDataByAppName has been
-            //implemented, it throws an AxisFault if the App doesn't exist. Hence the catch.
-            catch (AxisFault fault) {
-                oAuthAdminServiceStub.registerOAuthApplicationData(this.getRequestDTO());
-                appInfo = oAuthAdminServiceStub.getOAuthApplicationDataByAppName(
-                        DeviceManagementConstants.AppManagement.OAUTH_APPLICATION_NAME);
-            }
-        } catch (RemoteException e) {
-            handleException("Error occurred while retrieving app info", e);
-        } catch (OAuthAdminServiceException e) {
-            handleException("Error occurred while invoking OAuth admin service stub", e);
-        }
-        return appInfo;
-    }
-
-    private OAuthConsumerAppDTO getRequestDTO() {
-        OAuthConsumerAppDTO appDTO = new OAuthConsumerAppDTO();
-        appDTO.setApplicationName(DeviceManagementConstants.AppManagement.OAUTH_APPLICATION_NAME);
-        appDTO.setGrantTypes(
-                DeviceManagementConstants.AppManagement.OAUTH2_GRANT_TYPE_CLIENT_CREDENTIALS);
-        appDTO.setOAuthVersion(DeviceManagementConstants.AppManagement.OAUTH_VERSION_2);
-        return appDTO;
-    }
-
-    private void handleException(String msg, Exception e) throws ApplicationManagementException {
-        log.error(msg, e);
-        throw new ApplicationManagementException(msg, e);
-    }
-
     @Override
     public void updateApplicationListInstalledInDevice(
             DeviceIdentifier deviceIdentifier, List<Application> applications) throws ApplicationManagementException {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java

@@ -17,8 +17,14 @@
  */
 package org.wso2.carbon.device.mgt.core.config;
 
+import org.wso2.carbon.device.mgt.core.config.identity.IdentityConfigurations;
+import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
+import org.wso2.carbon.device.mgt.core.config.task.TaskConfiguration;
+
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
 
 /**
  * Represents Device Mgt configuration.
@@ -27,6 +33,10 @@ import javax.xml.bind.annotation.XmlRootElement;
 public final class DeviceManagementConfig {
 
     private DeviceManagementConfigRepository deviceManagementConfigRepository;
+    private TaskConfiguration taskConfiguration;
+    private IdentityConfigurations identityConfigurations;
+    private PolicyConfiguration policyConfiguration;
+    //private List<String> pushNotificationProviders;
 
     @XmlElement(name = "ManagementRepository", required = true)
     public DeviceManagementConfigRepository getDeviceManagementConfigRepository() {
@@ -37,4 +47,43 @@ public final class DeviceManagementConfig {
         this.deviceManagementConfigRepository = deviceManagementConfigRepository;
     }
 
+    @XmlElement(name = "IdentityConfiguration", required = true)
+    public IdentityConfigurations getIdentityConfigurations() {
+        return identityConfigurations;
+    }
+
+
+    public void setIdentityConfigurations(IdentityConfigurations identityConfigurations) {
+        this.identityConfigurations = identityConfigurations;
+    }
+
+    @XmlElement(name = "PolicyConfiguration", required = true)
+    public PolicyConfiguration getPolicyConfiguration() {
+        return policyConfiguration;
+    }
+
+    public void setPolicyConfiguration(PolicyConfiguration policyConfiguration) {
+        this.policyConfiguration = policyConfiguration;
+    }
+
+    @XmlElement(name = "TaskConfiguration", required = true)
+    public TaskConfiguration getTaskConfiguration() {
+        return taskConfiguration;
+    }
+
+    public void setTaskConfiguration(TaskConfiguration taskConfiguration) {
+        this.taskConfiguration = taskConfiguration;
+    }
+
+//    @XmlElementWrapper(name = "PushNotificationProviders", required = true)
+//    @XmlElement(name = "Provider", required = true)
+//    public List<String> getPushNotificationProviders() {
+//        return pushNotificationProviders;
+//    }
+//
+//    public void setPushNotificationProviders(List<String> pushNotificationProviders) {
+//        this.pushNotificationProviders = pushNotificationProviders;
+//    }
+
 }
+

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfigRepository.java

@@ -31,12 +31,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "ManagementRepository")
 public class DeviceManagementConfigRepository {
 
-
-//    private EmailConfigurations emailConfigurations;
-    private TaskConfiguration taskConfiguration;
 	private DataSourceConfig dataSourceConfig;
-	private IdentityConfigurations identityConfigurations;
-	private PolicyConfiguration policyConfiguration;
 
     @XmlElement(name = "DataSourceConfiguration", required = true)
     public DataSourceConfig getDataSourceConfig() {
@@ -47,40 +42,4 @@ public class DeviceManagementConfigRepository {
         this.dataSourceConfig = dataSourceConfig;
     }
 
-//    @XmlElement(name = "EmailClientConfiguration", required = true)
-//    public EmailConfigurations getEmailConfigurations() {
-//        return emailConfigurations;
-//    }
-//
-//    public void setEmailConfigurations(EmailConfigurations emailConfigurations) {
-//        this.emailConfigurations = emailConfigurations;
-//    }
-
-    @XmlElement(name = "IdentityConfiguration", required = true)
-    public IdentityConfigurations getIdentityConfigurations() {
-        return identityConfigurations;
-    }
-
-
-    public void setIdentityConfigurations(IdentityConfigurations identityConfigurations) {
-        this.identityConfigurations = identityConfigurations;
-    }
-
-    @XmlElement(name = "PolicyConfiguration", required = true)
-    public PolicyConfiguration getPolicyConfiguration() {
-        return policyConfiguration;
-    }
-
-    public void setPolicyConfiguration(PolicyConfiguration policyConfiguration) {
-        this.policyConfiguration = policyConfiguration;
-    }
-
-    @XmlElement(name = "TaskConfiguration", required = true)
-    public TaskConfiguration getTaskConfiguration() {
-        return taskConfiguration;
-    }
-
-    public void setTaskConfiguration(TaskConfiguration taskConfiguration) {
-        this.taskConfiguration = taskConfiguration;
-    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/policy/PolicyConfiguration.java

@@ -31,7 +31,7 @@ public class PolicyConfiguration {
     private int minRetriesToMarkUnreachable;
     private int minRetriesToMarkInactive;
 
-    @XmlElement(name = "monitoringClass", required = true)
+    @XmlElement(name = "MonitoringClass", required = true)
     public String getMonitoringClass() {
         return monitoringClass;
     }
@@ -40,7 +40,7 @@ public class PolicyConfiguration {
         this.monitoringClass = monitoringClass;
     }
 
-    @XmlElement(name = "maxRetries", required = true)
+    @XmlElement(name = "MaxRetries", required = true)
     public int getMaxRetries() {
         return maxRetries;
     }
@@ -49,7 +49,7 @@ public class PolicyConfiguration {
         this.maxRetries = maxRetries;
     }
 
-    @XmlElement(name = "minRetriesToMarkUnreachable", required = true)
+    @XmlElement(name = "MinRetriesToMarkUnreachable", required = true)
     public int getMinRetriesToMarkUnreachable() {
         return minRetriesToMarkUnreachable;
     }
@@ -58,7 +58,7 @@ public class PolicyConfiguration {
         this.minRetriesToMarkUnreachable = minRetriesToMarkUnreachable;
     }
 
-    @XmlElement(name = "monitoringEnable", required = true)
+    @XmlElement(name = "MonitoringEnable", required = true)
     public boolean getMonitoringEnable() {
         return monitoringEnable;
     }
@@ -67,7 +67,7 @@ public class PolicyConfiguration {
         this.monitoringEnable = monitoringEnable;
     }
 
-    @XmlElement(name = "minRetriesToMarkInactive", required = true)
+    @XmlElement(name = "MinRetriesToMarkInactive", required = true)
     public int getMinRetriesToMarkInactive() {
         return minRetriesToMarkInactive;
     }
@@ -76,7 +76,7 @@ public class PolicyConfiguration {
         this.minRetriesToMarkInactive = minRetriesToMarkInactive;
     }
 
-    @XmlElement(name = "monitoringFrequency", required = true)
+    @XmlElement(name = "MonitoringFrequency", required = true)
     public int getMonitoringFrequency() {
         return monitoringFrequency;
     }
@@ -84,4 +84,5 @@ public class PolicyConfiguration {
     public void setMonitoringFrequency(int monitoringFrequency) {
         this.monitoringFrequency = monitoringFrequency;
     }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceTaskManagerServiceComponent.java

@@ -52,8 +52,9 @@ public class DeviceTaskManagerServiceComponent {
                 log.debug("Initializing device details retrieving task manager bundle.");
             }
             // This will start the device details retrieving task.
-            boolean taskEnable = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+            boolean taskEnable =
-                    getDeviceManagementConfigRepository().getTaskConfiguration().isEnabled();
+                    DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getTaskConfiguration().
+                            isEnabled();
             if (taskEnable) {
                 DeviceTaskManagerService taskManagerService = new DeviceTaskManagerServiceImpl();
                 taskManagerService.startTask();
@@ -70,7 +71,6 @@ public class DeviceTaskManagerServiceComponent {
 
     @SuppressWarnings("unused")
     protected void deactivate(ComponentContext componentContext) {
-
         try {
             DeviceTaskManagerService taskManagerService = new DeviceTaskManagerServiceImpl();
             taskManagerService.stopTask();
@@ -93,6 +93,7 @@ public class DeviceTaskManagerServiceComponent {
         }
         DeviceManagementDataHolder.getInstance().setTaskService(null);
     }
+
 }
 
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -753,17 +753,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     public void notifyOperationToDevices(Operation operation, List<DeviceIdentifier> deviceIds)
             throws DeviceManagementException {
 
-        try {
+        for (DeviceIdentifier deviceId : deviceIds) {
-            for (DeviceIdentifier deviceId : deviceIds) {
+            DeviceManagementService dms =
-                DeviceManagementService dms =
+                    getPluginRepository().getDeviceManagementService(deviceId.getType(), this.getTenantId());
-                        getPluginRepository().getDeviceManagementService(deviceId.getType(), this.getTenantId());
+            //TODO FIX THIS WITH PUSH NOTIFICATIONS
-                dms.notifyOperationToDevices(operation, deviceIds);
+            //dms.notifyOperationToDevices(operation, deviceIds);
-            }
-        } catch (DeviceManagementException deviceMgtEx) {
-            String errorMsg = "Error in notify operations to plugins for app installation:" +
-                              deviceMgtEx.getErrorMessage();
-            log.error(errorMsg, deviceMgtEx);
-            throw new DeviceManagementException(errorMsg, deviceMgtEx);
         }
 
     }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/Utils.java

@@ -22,18 +22,16 @@ package org.wso2.carbon.device.mgt.core.task;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public class Utils {
 
-
+    public static Map<String, Long> getTenantedTaskOperationMap(Map<Integer, Map<String, Long>> map) {
-    public static HashMap<String, Long> getTenantedTaskOperationMap(HashMap<Integer, HashMap<String, Long>> map) {
-
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-
         if (map.containsKey(tenantId)) {
             return map.get(tenantId);
         } else {
-            HashMap<String, Long> mp = new HashMap<>();
+            Map<String, Long> mp = new HashMap<>();
             map.put(tenantId, mp);
             return mp;
         }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceTaskManagerImpl.java

@@ -36,23 +36,19 @@ import org.wso2.carbon.device.mgt.core.task.TaskOperation;
 import org.wso2.carbon.device.mgt.core.task.Utils;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 
 public class DeviceTaskManagerImpl implements DeviceTaskManager {
 
     private static Log log = LogFactory.getLog(DeviceTaskManagerImpl.class);
 
-    private static HashMap<Integer, HashMap<String, Long>> map = new HashMap<>();
+    private static Map<Integer, Map<String, Long>> map = new HashMap<>();
 
 
     @Override
     public List<TaskOperation> getOperationList() throws DeviceMgtTaskException {
-
+        TaskConfiguration taskConfiguration =
-        TaskConfiguration taskConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+                DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getTaskConfiguration();
-                getDeviceManagementConfigRepository().getTaskConfiguration();
 
         List<TaskConfiguration.Operation> ops = taskConfiguration.getOperations();
         List<TaskOperation> taskOperations = new ArrayList<>();
@@ -68,29 +64,25 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
 
     @Override
     public int getTaskFrequency() throws DeviceMgtTaskException {
-
+        return DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getTaskConfiguration().
-        return DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+                getFrequency();
-                getDeviceManagementConfigRepository().getTaskConfiguration().getFrequency();
     }
 
     @Override
     public String getTaskImplementedClazz() throws DeviceMgtTaskException {
-
+        return DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getTaskConfiguration().
-        return DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+                getTaskClazz();
-                getDeviceManagementConfigRepository().getTaskConfiguration().getTaskClazz();
     }
 
     @Override
     public boolean isTaskEnabled() throws DeviceMgtTaskException {
-
+        return DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getTaskConfiguration().
-        return DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+                isEnabled();
-                getDeviceManagementConfigRepository().getTaskConfiguration().isEnabled();
     }
 
 
     @Override
     public void addOperations() throws DeviceMgtTaskException {
-
         DeviceManagementProviderService deviceManagementProviderService =
                 DeviceManagementDataHolder.getInstance().getDeviceManagementProvider();
         try {
@@ -98,7 +90,6 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
             List<String> operations = this.getValidOperationNames();
 
             if (!devices.isEmpty()) {
-
                 for (String str : operations) {
                     CommandOperation operation = new CommandOperation();
                     operation.setEnabled(true);
@@ -116,17 +107,15 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
         } catch (OperationManagementException e) {
             throw new DeviceMgtTaskException("Error occurred while adding the operations to devices", e);
         }
-
     }
 
     @Override
     public List<String> getValidOperationNames() throws DeviceMgtTaskException {
-
         List<TaskOperation> taskOperations = this.getOperationList();
         List<String> opNames = new ArrayList<>();
         Long milliseconds = System.currentTimeMillis();
         int frequency = this.getTaskFrequency();
-        HashMap<String, Long> mp = Utils.getTenantedTaskOperationMap(map);
+        Map<String, Long> mp = Utils.getTenantedTaskOperationMap(map);
 
         for (TaskOperation top : taskOperations) {
             if (!mp.containsKey(top.getTaskName())) {
@@ -163,5 +152,6 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
         return false;
 
     }
+
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java

@@ -20,8 +20,10 @@ package org.wso2.carbon.device.mgt.core;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
+import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
 import java.util.List;
@@ -40,14 +42,6 @@ public class TestDeviceManagementService implements DeviceManagementService {
         return providerType;
     }
 
-    @Override
-    public String getProviderTenantDomain() { return tenantDomain;}
-
-    @Override
-    public boolean isSharedWithAllTenants() {
-        return true;
-    }
-
     @Override
     public void init() throws DeviceManagementException {
 
@@ -64,9 +58,13 @@ public class TestDeviceManagementService implements DeviceManagementService {
     }
 
     @Override
-    public void notifyOperationToDevices(Operation operation, List<DeviceIdentifier> deviceIds)
+    public ProvisioningConfig getProvisioningConfig() {
-            throws DeviceManagementException {
+        return new ProvisioningConfig(tenantDomain, false);
+    }
 
+    @Override
+    public PushNotificationConfig getPushNotificationConfig() {
+        return null;
     }
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagementProviderServiceTest.java

@@ -27,7 +27,6 @@ import org.wso2.carbon.device.mgt.common.app.mgt.Application;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
 import org.wso2.carbon.device.mgt.core.DeviceManagementPluginRepository;
 import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
-import org.wso2.carbon.device.mgt.core.app.mgt.config.AppManagementConfig;
 import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
 
 import java.util.ArrayList;
@@ -35,13 +34,11 @@ import java.util.List;
 
 public class ApplicationManagementProviderServiceTest {
 
-    private ApplicationManagementProviderService appMgtProvider;
     private static final Log log = LogFactory.getLog(ApplicationManagementProviderServiceTest.class);
-    private DeviceManagementPluginRepository deviceManagementPluginRepository = null;
 
     @BeforeClass
     public void init() {
-        deviceManagementPluginRepository = new DeviceManagementPluginRepository();
+        DeviceManagementPluginRepository deviceManagementPluginRepository = new DeviceManagementPluginRepository();
         TestDeviceManagementService testDeviceManagementService =
                 new TestDeviceManagementService(TestDataHolder.TEST_DEVICE_TYPE, TestDataHolder.SUPER_TENANT_DOMAIN);
         try {
@@ -82,8 +79,7 @@ public class ApplicationManagementProviderServiceTest {
         deviceId.setId(deviceIdentifier);
         deviceId.setType(device.getType());
 
-        AppManagementConfig appManagementConfig = new AppManagementConfig();
+        ApplicationManagementProviderService appMgtProvider = new ApplicationManagerProviderServiceImpl();
-        appMgtProvider = new ApplicationManagerProviderServiceImpl();
 
         try {
             appMgtProvider.updateApplicationListInstalledInDevice(deviceId, applications);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/device.js

@@ -97,61 +97,6 @@ deviceModule = function () {
         }
     };
 
-    /*
-     @Deprecated
-     */
-    publicMethods.listDevicesForUser = function (username) {
-        var carbonUser = session.get(constants.USER_SESSION_KEY);
-        var utility = require('/app/modules/utility.js').utility;
-        if (!carbonUser) {
-            log.error("User object was not found in the session");
-            throw constants.ERRORS.USER_NOT_FOUND;
-        }
-        try {
-            utility.startTenantFlow(carbonUser);
-            var deviceManagementService = utility.getDeviceManagementService();
-            var devices = deviceManagementService.getDevicesOfUser(username);
-            var deviceList = [];
-            var i, device, propertiesList, deviceObject;
-            for (i = 0; i < devices.size(); i++) {
-                device = devices.get(i);
-                propertiesList = DeviceManagerUtil.convertDevicePropertiesToMap(device.getProperties());
-
-                deviceObject = {};
-                deviceObject[constants.DEVICE_IDENTIFIER] =
-                    privateMethods.validateAndReturn(device.getDeviceIdentifier());
-                deviceObject[constants.DEVICE_NAME] =
-                    privateMethods.validateAndReturn(device.getName());
-                deviceObject[constants.DEVICE_OWNERSHIP] =
-                    privateMethods.validateAndReturn(device.getEnrolmentInfo().getOwnership());
-                deviceObject[constants.DEVICE_OWNER] =
-                    privateMethods.validateAndReturn(device.getEnrolmentInfo().getOwner());
-                deviceObject[constants.DEVICE_TYPE] =
-                    privateMethods.validateAndReturn(device.getType());
-                deviceObject[constants.DEVICE_PROPERTIES] = {};
-                if (device.getType() == constants.PLATFORM_IOS) {
-                    deviceObject[constants.DEVICE_PROPERTIES][constants.DEVICE_MODEL] =
-                        privateMethods.validateAndReturn(propertiesList.get(constants.DEVICE_PRODUCT));
-                    deviceObject[constants.DEVICE_PROPERTIES][constants.DEVICE_VENDOR] = constants.VENDOR_APPLE;
-                } else {
-                    deviceObject[constants.DEVICE_PROPERTIES][constants.DEVICE_MODEL] =
-                        privateMethods.validateAndReturn(propertiesList.get(constants.DEVICE_MODEL));
-                    deviceObject[constants.DEVICE_PROPERTIES][constants.DEVICE_VENDOR] =
-                        privateMethods.validateAndReturn(propertiesList.get(constants.DEVICE_VENDOR));
-                }
-                deviceObject[constants.DEVICE_PROPERTIES][constants.DEVICE_OS_VERSION] =
-                    privateMethods.validateAndReturn(propertiesList.get(constants.DEVICE_OS_VERSION));
-
-                deviceList.push(deviceObject);
-            }
-            return deviceList;
-        } catch (e) {
-            throw e;
-        } finally {
-            utility.endTenantFlow();
-        }
-    };
-
     /*
      @Deprecated
      */
@@ -298,8 +243,7 @@ deviceModule = function () {
                             deviceObject[constants["DEVICE_PROPERTIES"]] = properties;
                             return deviceObject;
                         }
-                    }
+                    },
-                    ,
                     function (responsePayload) {
                         var response = {};
                         response["status"] = "error";
@@ -321,8 +265,7 @@ deviceModule = function () {
         return serviceInvokers.XMLHttp.get(
                 url, function (responsePayload) {
                     return responsePayload;
-                }
+                },
-                ,
                 function (responsePayload) {
                     log.error(responsePayload);
                     return -1;
@@ -335,8 +278,7 @@ deviceModule = function () {
         return serviceInvokers.XMLHttp.get(
                 url, function (responsePayload) {
                     return responsePayload;
-                }
+                },
-                ,
                 function (responsePayload) {
                     log.error(responsePayload);
                     return -1;
@@ -344,14 +286,12 @@ deviceModule = function () {
         );
     };
 
-
     publicMethods.getDeviceTypes = function () {
         var url = devicemgtProps["httpsURL"] + constants.ADMIN_SERVICE_CONTEXT + "/devices/types";
         return serviceInvokers.XMLHttp.get(
                 url, function (responsePayload) {
                     return responsePayload;
-                }
+                },
-                ,
                 function (responsePayload) {
                     log.error(responsePayload);
                     return -1;
@@ -383,86 +323,20 @@ deviceModule = function () {
         return license;
     };
 
-    publicMethods.getOwnDevices = function () {
+    publicMethods.getDevices = function (userName) {
-        var listAllDevicesEndPoint = deviceCloudService + "/device/user/" + user.username + "/all";
+        var url = devicemgtProps["httpsURL"] + constants.ADMIN_SERVICE_CONTEXT + "/devices/user/" + userName;
-        var result = get(listAllDevicesEndPoint, {}, "json");
+        return serviceInvokers.XMLHttp.get(
-        var devices = result.data;
+                url, function (responsePayload) {
-        var device;
+                    for (var i = 0; i < responsePayload.length; i++) {
-        for (var d in devices){
+                        responsePayload[i].thumb = utility.getDeviceThumb(responsePayload[i].type);
-            device = devices[d];
+                    }
-            device.assetId = publicMethods.getAssetId(device.deviceType);
+                    return responsePayload;
-        }
+                },
-        return result;
+                function (responsePayload) {
+                    log.error(responsePayload);
+                    return -1;
+                }
+        );
     };
-
-    publicMethods.getAllPermittedDevices = function () {
-        var groupModule = require("/app/modules/group.js").groupModule;
-
-        var result = publicMethods.getUnGroupedDevices();
-        var unGroupedDevices = result.data;
-        var user_groups = groupModule.getGroups().data;
-        var allDevices = [];
-        var deviceCount = unGroupedDevices.length;
-        for (var g in user_groups) {
-            var deviceInGroup = user_groups[g].devices;
-            deviceCount += deviceInGroup.length;
-            if (deviceInGroup && deviceInGroup.length == 0) {
-                delete user_groups[g]["devices"];
-            }
-            var device;
-            for (var d in deviceInGroup){
-                device = deviceInGroup[d];
-                device.assetId = publicMethods.getAssetId(device.type);
-            }
-            allDevices.push(user_groups[g]);
-        }
-        allDevices.push({id: 0, devices: unGroupedDevices});
-        result.data = allDevices;
-        result.device_count = deviceCount;
-        return result;
-    };
-
-    publicMethods.removeDevice = function (deviceType, deviceId) {
-        var carbonUser = session.get(constants.USER_SESSION_KEY);
-        if (!carbonUser) {
-            log.error("User object was not found in the session");
-            throw constants.ERRORS.USER_NOT_FOUND;
-        }
-        try {
-            utility.startTenantFlow(carbonUser);
-            var deviceManagementService = utility.getDeviceManagementService();
-            var deviceIdentifier = new DeviceIdentifier();
-            deviceIdentifier.setType(deviceType);
-            deviceIdentifier.setId(deviceId);
-            return deviceManagementService.disenrollDevice(deviceIdentifier);
-        } catch (e) {
-            throw e;
-        } finally {
-            utility.endTenantFlow();
-        }
-    };
-
-    publicMethods.updateDevice = function (deviceType, deviceId, deviceName) {
-        var carbonUser = session.get(constants.USER_SESSION_KEY);
-        if (!carbonUser) {
-            log.error("User object was not found in the session");
-            throw constants.ERRORS.USER_NOT_FOUND;
-        }
-        try {
-            utility.startTenantFlow(carbonUser);
-            var deviceManagementService = utility.getDeviceManagementService();
-            var deviceIdentifier = new DeviceIdentifier();
-            deviceIdentifier.setType(deviceType);
-            deviceIdentifier.setId(deviceId);
-            var device = deviceManagementService.getDevice(deviceIdentifier);
-            device.setName(deviceName);
-            return deviceManagementService.modifyEnrollment(device);
-        } catch (e) {
-            throw e;
-        } finally {
-            utility.endTenantFlow();
-        }
-    };
-
     return publicMethods;
 }();

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/group.js

@@ -20,6 +20,7 @@ var groupModule = {};
 (function (groupModule) {
     var log = new Log("/app/modules/group.js");
 
+    var userModule = require("/app/modules/user.js").userModule;
     var constants = require('/app/modules/constants.js');
     var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
     var utility = require("/app/modules/utility.js").utility;
@@ -32,7 +33,12 @@ var groupModule = {};
     var endPoint;
 
     groupModule.getGroupCount = function () {
-        endPoint = groupServiceEndpoint + "/user/" + user.username + "/count";
+        var permissions = userModule.getUIPermissions();
+        if (permissions.LIST_ALL_GROUPS) {
+            endPoint = groupServiceEndpoint + "/count";
+        } else if (permissions.LIST_GROUPS) {
+            endPoint = groupServiceEndpoint + "/user/" + user.username + "/count";
+        }
         return serviceInvokers.XMLHttp.get(
                 endPoint, function (responsePayload) {
                     return responsePayload;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/policy.js

@@ -67,8 +67,7 @@ policyModule = function () {
             policyObjectToView["priorityId"] = policyObjectFromRestEndpoint["priorityId"];
             policyObjectToView["name"] = policyObjectFromRestEndpoint["policyName"];
             policyObjectToView["platform"] = policyObjectFromRestEndpoint["profile"]["deviceType"]["name"];
-            policyObjectToView["icon"] = devicemgtProps["httpsURL"] + devicemgtProps["appContext"] +
+            policyObjectToView["icon"] = utility.getDeviceThumb(policyObjectToView["platform"]);
-                "public/cdmf.unit.device.type." + policyObjectToView["platform"] + ".type-view/images/thumb.png";
             policyObjectToView["ownershipType"] = policyObjectFromRestEndpoint["ownershipType"];
             policyObjectToView["roles"] = privateMethods.
             getElementsInAString(policyObjectFromRestEndpoint["roles"]);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js

@@ -18,6 +18,9 @@
 
 var utility;
 utility = function () {
+
+    var constants = require('/app/modules/constants.js');
+    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
     var log = new Log("/app/modules/utility.js");
     var JavaClass = Packages.java.lang.Class;
     var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext;
@@ -104,26 +107,43 @@ utility = function () {
     };
 
     publicMethods.getOperationIcon = function (deviceType, operation) {
-        var iconPath = "/app/units/cdmf.unit.device.type."
+        var unitName = publicMethods.getTenantedDeviceUnitName(deviceType, "type-view");
-                       + deviceType + ".type-view/public/images/operations/" + operation + ".png";
+        var iconPath = "/app/units/" + unitName + "/public/images/operations/" + operation + ".png";
         var icon = new File(iconPath);
         if (icon.isExists()) {
-            return "public/cdmf.unit.device.type." + deviceType + ".type-view/images/operations/" + operation + ".png";
+            return devicemgtProps["appContext"] + "public/" + unitName + "/images/operations/" + operation + ".png";
         } else {
             return null;
         }
     };
 
     publicMethods.getDeviceThumb = function (deviceType) {
-        var iconPath = "/app/units/cdmf.unit.device.type."
+        var unitName = publicMethods.getTenantedDeviceUnitName(deviceType, "type-view");
-                       + deviceType + ".type-view/public/images/thumb.png";
+        var iconPath = "/app/units/" + unitName + "/public/images/thumb.png";
         var icon = new File(iconPath);
         if (icon.isExists()) {
-            return "/devicemgt/public/cdmf.unit.device.type." + deviceType + ".type-view/images/thumb.png";
+            return devicemgtProps["appContext"] + "public/" + unitName + "/images/thumb.png";
         } else {
             return null;
         }
     };
 
+    publicMethods.getTenantedDeviceUnitName = function (deviceType, unitPostfix) {
+        var user = session.get(constants.USER_SESSION_KEY);
+        if (!user) {
+            log.error("User object was not found in the session");
+            throw constants.ERRORS.USER_NOT_FOUND;
+        }
+        var unitName = user.domain + "cdmf.unit.device.type." + deviceType + "." + unitPostfix;
+        if (new File("/app/units/" + unitName).isExists()) {
+            return unitName;
+        }
+        unitName = "cdmf.unit.device.type." + deviceType + "." + unitPostfix;
+        if (new File("/app/units/" + unitName).isExists()) {
+            return unitName;
+        }
+        return null;
+    };
+
     return publicMethods;
 }();

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/analytics.hbs

@@ -0,0 +1,89 @@
+{{#zone "topCss"}}
+    {{css "css/analytics.css"}}
+    {{css "css/daterangepicker.css"}}
+    {{css "css/graph.css"}}
+{{/zone}}
+
+{{unit "cdmf.unit.ui.title" pageTitle="Analytics"}}
+{{unit "cdmf.unit.ui.content.title" pageHeader=title}}
+{{unit "cdmf.unit.lib.service-invoker-utility"}}
+{{unit "cdmf.unit.lib.handlebars"}}
+
+{{#zone "breadcrumbs"}}
+    <li>
+        <a href="{{@app.context}}/">
+            <i class="icon fw fw-home"></i>
+        </a>
+    </li>
+    {{#if groupName}}
+        <li>
+            <a href="{{@app.context}}/groups">
+                Groups
+            </a>
+        </li>
+        <li>
+            <a href="{{@app.context}}/devices?groupId={{groupId}}&groupName={{groupName}}">
+                {{groupName}}
+            </a>
+        </li>
+    {{else}}
+        <li>
+            <a href="{{@app.context}}/devices">
+                Devices
+            </a>
+        </li>
+        <li>
+            <a href="{{@app.context}}/device/{{deviceType}}?id={{deviceId}}">
+                {{deviceName}}
+            </a>
+        </li>
+    {{/if}}
+    <li>
+        <a href="#">
+            Analytics
+        </a>
+    </li>
+{{/zone}}
+
+{{#zone "content"}}
+    <div class="container container-bg  white-bg">
+        <div class=" margin-top-double">
+            <div class="row padding-top-double padding-bottom-double margin-bottom-double">
+                <div class="col-lg-3  margin-top-double">
+                    <h1 class="grey ">{{deviceType}} Analytics</h1>
+                </div>
+                <div id="rangeSliderWrapper" class="pull-right col-lg-9">
+                    <div id="dateRangePickerContainer">
+                        <div class="btn-group" role="group">
+                            <button id="hour-btn" type="button"
+                                    class="btn btn-default date-range">Hour
+                            </button>
+                            <button id="h12-btn" type="button"
+                                    class="btn btn-default date-range">12 Hours
+                            </button>
+                            <button id="h24-btn" type="button"
+                                    class="btn btn-default date-range">24 Hours
+                            </button>
+                            <button id="h48-btn" type="button"
+                                    class="btn btn-default date-range">48 Hours
+                            </button>
+                            <button id="date-range" type="button"
+                                    class="btn btn-default date-range last-child"
+                                    data-toggle="popup"
+                                    title="Click to set custom date range"></button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <hr>
+            <div class="clear"></div>
+            <div id="div-chart">
+                {{unit deviceAnalyticsViewUnitName}}
+            </div>
+        </div>
+    </div>
+{{/zone}}
+{{#zone "bottomJs"}}
+    {{js "js/jquery.daterangepicker.js"}}
+    {{js "js/graph_util.js"}}
+{{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/analytics.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function onRequest(context) {
+	context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
+		if (arguments.length < 3)
+			throw new Error("Handlebars Helper equal needs 2 parameters");
+		if (lvalue != rvalue) {
+			return options.inverse(this);
+		} else {
+			return options.fn(this);
+		}
+	});
+
+	var deviceType = context.uriParams.deviceType;
+	return {
+		"deviceAnalyticsViewUnitName": "cdmf.unit.device.type." + deviceType + ".analytics-view",
+		"deviceType": deviceType
+	};
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/analytics.json

@@ -0,0 +1,5 @@
+{
+    "version": "1.0.0",
+    "uri": "/device/analytics/{deviceType}",
+    "layout": "cdmf.layout.default"
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/public/css/analytics.css

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#rangeSliderWrapper {
+    margin-top: 25px;
+}
+
+#chart {
+    display: inline-block;
+}
+
+#legend {
+    display: inline-block;
+    position: relative;
+    left: 8px;
+}
+
+#legend_container {
+    position: absolute;
+    right: 0;
+    bottom: 26px;
+    width: 0;
+}
+
+#chart_container {
+    float: left;
+    position: relative;
+}
+
+.ast-container {
+    padding-bottom: 30px;
+}
+
+.container {
+    width: auto;
+}
+
+.shrink {
+    margin-right: 20px;
+    margin-left: 20px;
+}
+.date-range{
+    border: 1px solid #ccc;
+}
+
+#dateRangePickerContainer button.active{
+    background-color: #e6e6e6 !important;
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/public/css/daterangepicker.css

@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.date-picker {
+    width: 170px;
+    height: 25px;
+    padding: 0;
+    border: 0;
+    line-height: 25px;
+    padding-left: 10px;
+    font-size: 12px;
+    font-family: Arial;
+    font-weight: bold;
+    cursor: pointer;
+    color: #303030;
+    position: relative;
+    z-index: 2;
+}
+
+.date-picker-wrapper {
+    position: absolute;
+    z-index: 1;
+    border: 1px solid #bfbfbf;
+    background-color: #efefef;
+    width: 448px;
+    padding: 5px 12px;
+    font-size: 12px;
+    line-height: 20px;
+    color: #aaa;
+    font-family: Arial;
+    box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.5);
+}
+
+.date-picker-wrapper.single-date {
+    width: auto;
+}
+
+.date-picker-wrapper.no-shortcuts {
+    padding-bottom: 12px;
+}
+
+.date-picker-wrapper .footer {
+    display: none;
+    font-size: 11px;
+    padding-top: 3px;
+}
+
+.date-picker-wrapper b {
+    color: #666;
+    font-weight: 700;
+}
+
+.date-picker-wrapper a {
+    color: rgb(107, 180, 214);
+    text-decoration: underline;
+}
+
+.date-picker-wrapper .month-wrapper {
+    border: 1px solid #bfbfbf;
+    border-radius: 3px;
+    background-color: #fff;
+    padding: 5px;
+    cursor: default;
+    position: relative;
+    _overflow: hidden;
+}
+
+.date-picker-wrapper .month-wrapper table {
+    width: 190px;
+    float: left;
+}
+
+.date-picker-wrapper .month-wrapper table.month2 {
+    width: 190px;
+    float: right;
+}
+
+.date-picker-wrapper .month-wrapper table th,
+.date-picker-wrapper .month-wrapper table td {
+    vertical-align: middle;
+    text-align: center;
+    line-height: 14px;
+    margin: 0px;
+    padding: 0px;
+}
+
+.date-picker-wrapper .month-wrapper table .day {
+    height: 19px;
+    line-height: 19px;
+    font-size: 12px;
+    margin-bottom: 1px;
+    color: #999;
+    cursor: default;
+}
+
+.date-picker-wrapper .month-wrapper table div.day.lastMonth,
+.date-picker-wrapper .month-wrapper table div.day.nextMonth {
+    color: #999;
+    cursor: default;
+}
+
+.date-picker-wrapper .month-wrapper table .day.checked {
+    background-color: rgb(156, 219, 247);
+}
+
+.date-picker-wrapper .month-wrapper table .week-name {
+    height: 20px;
+    line-height: 20px;
+    font-weight: 100;
+}
+
+.date-picker-wrapper .month-wrapper table .day.has-tooltip {
+    cursor: help !important;
+}
+
+.date-picker-wrapper .month-wrapper table .day.toMonth.valid {
+    color: #333;
+    cursor: pointer;
+}
+
+.date-picker-wrapper .month-wrapper table .day.real-today {
+    background-color: rgb(255, 230, 132);
+}
+
+.date-picker-wrapper .month-wrapper table .day.real-today.checked {
+    background-color: rgb(112, 204, 213);
+}
+
+.date-picker-wrapper table .caption {
+    height: 40px;
+}
+
+.date-picker-wrapper table .caption .next,
+.date-picker-wrapper table .caption .prev {
+    padding: 0 5px;
+    cursor: pointer;
+}
+
+.date-picker-wrapper table .caption .next:hover,
+.date-picker-wrapper table .caption .prev:hover {
+    background-color: #ccc;
+    color: white;
+}
+
+.date-picker-wrapper .gap {
+    position: absolute;
+    display: none;
+    top: 0px;
+    left: 204px;
+    z-index: 1;
+    width: 15px;
+    height: 100%;
+    background-color: red;
+    font-size: 0;
+    line-height: 0;
+}
+
+.date-picker-wrapper .gap .gap-lines {
+    height: 100%;
+    overflow: hidden;
+}
+
+.date-picker-wrapper .gap .gap-line {
+    height: 15px;
+    width: 15px;
+    position: relative;
+}
+
+.date-picker-wrapper .gap .gap-line .gap-1 {
+    z-index: 1;
+    height: 0;
+    border-left: 8px solid white;
+    border-top: 8px solid #eee;
+    border-bottom: 8px solid #eee;
+}
+
+.date-picker-wrapper .gap .gap-line .gap-2 {
+    position: absolute;
+    right: 0;
+    top: 0px;
+    z-index: 2;
+    height: 0;
+    border-left: 8px solid transparent;
+    border-top: 8px solid white;
+}
+
+.date-picker-wrapper .gap .gap-line .gap-3 {
+    position: absolute;
+    right: 0;
+    top: 8px;
+    z-index: 2;
+    height: 0;
+    border-left: 8px solid transparent;
+    border-bottom: 8px solid white;
+}
+
+.date-picker-wrapper .gap .gap-top-mask {
+    width: 6px;
+    height: 1px;
+    position: absolute;
+    top: -1px;
+    left: 1px;
+    background-color: #eee;
+    z-index: 3;
+}
+
+.date-picker-wrapper .gap .gap-bottom-mask {
+    width: 6px;
+    height: 1px;
+    position: absolute;
+    bottom: -1px;
+    left: 7px;
+    background-color: #eee;
+    z-index: 3;
+}
+
+.date-picker-wrapper .selected-days {
+    display: none;
+}
+
+.date-picker-wrapper .drp_top-bar {
+    line-height: 40px;
+    height: 40px;
+    position: relative;
+}
+
+.date-picker-wrapper .drp_top-bar .error-top {
+    display: none;
+}
+
+.date-picker-wrapper .drp_top-bar .normal-top {
+    display: none;
+}
+
+.date-picker-wrapper .drp_top-bar .default-top {
+    display: block;
+}
+
+.date-picker-wrapper .drp_top-bar.error .default-top {
+    display: none;
+}
+
+.date-picker-wrapper .drp_top-bar.error .error-top {
+    display: block;
+    color: red;
+}
+
+.date-picker-wrapper .drp_top-bar.normal .default-top {
+    display: none;
+}
+
+.date-picker-wrapper .drp_top-bar.normal .normal-top {
+    display: block;
+}
+
+.date-picker-wrapper .drp_top-bar .apply-btn {
+    position: absolute;
+    right: 0px;
+    top: 6px;
+    padding: 3px 5px;
+    margin: 0;
+    font-size: 12px;
+    border-radius: 4px;
+    cursor: pointer;
+
+    color: #d9eef7;
+    border: solid 1px #0076a3;
+    background: #0095cd;
+    background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
+    background: -moz-linear-gradient(top, #00adee, #0078a5);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
+    color: white;
+}
+
+.date-picker-wrapper .drp_top-bar .apply-btn.disabled {
+    pointer-events: none;
+    color: #606060;
+    border: solid 1px #b7b7b7;
+    background: #fff;
+    background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
+    background: -moz-linear-gradient(top, #fff, #ededed);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
+}
+
+/*time styling*/
+.time {
+    position: relative;
+}
+
+.time input[type=range] {
+    vertical-align: middle;
+}
+
+.time1, .time2 {
+    width: 180px;
+    padding: 0 5px;
+    text-align: center;
+}
+
+.time1 {
+    float: left;
+}
+
+.time2 {
+    float: right;
+}
+
+.hour, .minute {
+    text-align: left;
+}
+
+.hide {
+    display: none;
+}
+
+input.hour-range, input.minute-range {
+    width: 150px;
+}
+
+#dateRangePickerContainer .date-range, #dateRangePickerContainer .input-append {
+    background: none !important;
+}
+
+#date-range {
+    padding-right: 30px;
+    width: 300px;
+    height: 100%;
+    display: inline-block;
+}
+
+#dateRangePickerContainer {
+    float: right;
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/public/css/graph.css

@@ -0,0 +1,463 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* graph */
+
+.rickshaw_graph {
+    position: relative;
+}
+
+.rickshaw_graph svg {
+    display: block;
+    overflow: hidden;
+}
+
+/* ticks */
+
+.rickshaw_graph .x_tick {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 0;
+    border-left: 1px dotted rgba(0, 0, 0, 0.2);
+    pointer-events: none;
+}
+
+.rickshaw_graph .x_tick .title {
+    position: absolute;
+    font-size: 12px;
+    font-family: Arial, sans-serif;
+    opacity: 0.5;
+    white-space: nowrap;
+    margin-left: 3px;
+    bottom: -20px;
+    height: auto;
+    border-bottom: none;
+}
+
+/* annotations */
+
+.rickshaw_annotation_timeline {
+    height: 1px;
+    border-top: 1px solid #e0e0e0;
+    margin-top: 10px;
+    position: relative;
+}
+
+.rickshaw_annotation_timeline .annotation {
+    position: absolute;
+    height: 6px;
+    width: 6px;
+    margin-left: -2px;
+    top: -3px;
+    border-radius: 5px;
+    background-color: rgba(0, 0, 0, 0.25);
+}
+
+.rickshaw_graph .annotation_line {
+    position: absolute;
+    top: 0;
+    bottom: -6px;
+    width: 0;
+    border-left: 2px solid rgba(0, 0, 0, 0.3);
+    display: none;
+}
+
+.rickshaw_graph .annotation_line.active {
+    display: block;
+}
+
+.rickshaw_graph .annotation_range {
+    background: rgba(0, 0, 0, 0.1);
+    display: none;
+    position: absolute;
+    top: 0;
+    bottom: -6px;
+}
+
+.rickshaw_graph .annotation_range.active {
+    display: block;
+}
+
+.rickshaw_graph .annotation_range.active.offscreen {
+    display: none;
+}
+
+.rickshaw_annotation_timeline .annotation .content {
+    background: white;
+    color: black;
+    opacity: 0.9;
+    box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
+    border-radius: 3px;
+    position: relative;
+    z-index: 20;
+    font-size: 12px;
+    padding: 6px 8px 8px;
+    top: 18px;
+    left: -11px;
+    width: 160px;
+    display: none;
+    cursor: pointer;
+}
+
+.rickshaw_annotation_timeline .annotation .content:before {
+    content: "\25b2";
+    position: absolute;
+    top: -11px;
+    color: white;
+    text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8);
+}
+
+.rickshaw_annotation_timeline .annotation.active,
+.rickshaw_annotation_timeline .annotation:hover {
+    background-color: rgba(0, 0, 0, 0.8);
+    cursor: none;
+}
+
+.rickshaw_annotation_timeline .annotation .content:hover {
+    z-index: 50;
+}
+
+.rickshaw_annotation_timeline .annotation.active .content {
+    display: block;
+}
+
+.rickshaw_annotation_timeline .annotation:hover .content {
+    display: block;
+    z-index: 50;
+}
+
+.rickshaw_graph .y_axis,
+.rickshaw_graph .x_axis_d3 {
+    fill: none;
+}
+
+.rickshaw_graph .y_ticks .tick line,
+.rickshaw_graph .x_ticks_d3 .tick {
+    stroke: rgba(0, 0, 0, 0.16);
+    stroke-width: 2px;
+    shape-rendering: crisp-edges;
+    pointer-events: none;
+}
+
+.rickshaw_graph .y_grid .tick,
+.rickshaw_graph .x_grid_d3 .tick {
+    z-index: -1;
+    stroke: rgba(0, 0, 0, 0.20);
+    stroke-width: 1px;
+    stroke-dasharray: 1 1;
+}
+
+.rickshaw_graph .y_grid .tick[data-y-value="0"] {
+    stroke-dasharray: 1 0;
+}
+
+.rickshaw_graph .y_grid path,
+.rickshaw_graph .x_grid_d3 path {
+    fill: none;
+    stroke: none;
+}
+
+.rickshaw_graph .y_ticks path,
+.rickshaw_graph .x_ticks_d3 path {
+    fill: none;
+    stroke: #808080;
+}
+
+.rickshaw_graph .y_ticks text,
+.rickshaw_graph .x_ticks_d3 text {
+    opacity: 0.5;
+    font-size: 12px;
+    pointer-events: none;
+}
+
+.rickshaw_graph .x_tick.glow .title,
+.rickshaw_graph .y_ticks.glow text {
+    fill: black;
+    color: black;
+    text-shadow: -1px 1px 0 rgba(255, 255, 255, 0.1),
+    1px -1px 0 rgba(255, 255, 255, 0.1),
+    1px 1px 0 rgba(255, 255, 255, 0.1),
+    0 1px 0 rgba(255, 255, 255, 0.1),
+    0 -1px 0 rgba(255, 255, 255, 0.1),
+    1px 0 0 rgba(255, 255, 255, 0.1),
+    -1px 0 0 rgba(255, 255, 255, 0.1),
+    -1px -1px 0 rgba(255, 255, 255, 0.1);
+}
+
+.rickshaw_graph .x_tick.inverse .title,
+.rickshaw_graph .y_ticks.inverse text {
+    fill: white;
+    color: white;
+    text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.8),
+    1px -1px 0 rgba(0, 0, 0, 0.8),
+    1px 1px 0 rgba(0, 0, 0, 0.8),
+    0 1px 0 rgba(0, 0, 0, 0.8),
+    0 -1px 0 rgba(0, 0, 0, 0.8),
+    1px 0 0 rgba(0, 0, 0, 0.8),
+    -1px 0 0 rgba(0, 0, 0, 0.8),
+    -1px -1px 0 rgba(0, 0, 0, 0.8);
+}
+
+.custom_rickshaw_graph {
+    position: relative;
+    left: 40px;
+}
+
+.custom_y_axis {
+    position: absolute;
+    width: 40px;
+}
+
+.custom_slider {
+    left: 40px;
+}
+
+.custom_x_axis {
+    position: relative;
+    left: 40px;
+    height: 30px;
+}
+
+/*detail*/
+
+.rickshaw_graph .detail {
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    z-index: 2;
+    background: rgba(0, 0, 0, 0.1);
+    bottom: 0;
+    width: 1px;
+    transition: opacity 0.25s linear;
+    -moz-transition: opacity 0.25s linear;
+    -o-transition: opacity 0.25s linear;
+    -webkit-transition: opacity 0.25s linear;
+}
+
+.rickshaw_graph .detail.inactive {
+    opacity: 0;
+}
+
+.rickshaw_graph .detail .item.active {
+    opacity: 1;
+}
+
+.rickshaw_graph .detail .x_label {
+    font-family: Arial, sans-serif;
+    border-radius: 3px;
+    padding: 6px;
+    opacity: 0.5;
+    border: 1px solid #e0e0e0;
+    font-size: 12px;
+    position: absolute;
+    background: white;
+    white-space: nowrap;
+}
+
+.rickshaw_graph .detail .x_label.left {
+    left: 0;
+}
+
+.rickshaw_graph .detail .x_label.right {
+    right: 0;
+}
+
+.rickshaw_graph .detail .item {
+    position: absolute;
+    z-index: 2;
+    border-radius: 3px;
+    padding: 0.25em;
+    font-size: 12px;
+    font-family: Arial, sans-serif;
+    opacity: 0;
+    background: rgba(0, 0, 0, 0.4);
+    color: white;
+    border: 1px solid rgba(0, 0, 0, 0.4);
+    margin-left: 1em;
+    margin-right: 1em;
+    margin-top: -1em;
+    white-space: nowrap;
+}
+
+.rickshaw_graph .detail .item.left {
+    left: 0;
+}
+
+.rickshaw_graph .detail .item.right {
+    right: 0;
+}
+
+.rickshaw_graph .detail .item.active {
+    opacity: 1;
+    background: rgba(0, 0, 0, 0.8);
+}
+
+.rickshaw_graph .detail .item:after {
+    position: absolute;
+    display: block;
+    width: 0;
+    height: 0;
+
+    content: "";
+
+    border: 5px solid transparent;
+}
+
+.rickshaw_graph .detail .item.left:after {
+    top: 1em;
+    left: -5px;
+    margin-top: -5px;
+    border-right-color: rgba(0, 0, 0, 0.8);
+    border-left-width: 0;
+}
+
+.rickshaw_graph .detail .item.right:after {
+    top: 1em;
+    right: -5px;
+    margin-top: -5px;
+    border-left-color: rgba(0, 0, 0, 0.8);
+    border-right-width: 0;
+}
+
+.rickshaw_graph .detail .dot {
+    width: 4px;
+    height: 4px;
+    margin-left: -3px;
+    margin-top: -3.5px;
+    border-radius: 5px;
+    position: absolute;
+    box-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
+    box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    background: white;
+    border-width: 2px;
+    border-style: solid;
+    display: none;
+    background-clip: padding-box;
+}
+
+.rickshaw_graph .detail .dot.active {
+    display: block;
+}
+
+/*legend*/
+.rickshaw_legend {
+    font-family: Arial;
+    font-size: 12px;
+    color: white;
+    background: #404040;
+    display: inline-block;
+    padding: 12px 5px;
+    border-radius: 2px;
+    position: relative;
+    float: right;
+}
+
+.rickshaw_legend:hover {
+    z-index: 10;
+}
+
+.rickshaw_legend .swatch {
+    width: 10px;
+    height: 10px;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+}
+
+.rickshaw_legend .line {
+    clear: both;
+    line-height: 140%;
+    padding-right: 15px;
+}
+
+.rickshaw_legend .line .swatch {
+    display: inline-block;
+    margin-right: 3px;
+    border-radius: 2px;
+}
+
+.rickshaw_legend .label {
+    margin: 0;
+    white-space: nowrap;
+    display: inline;
+    font-size: inherit;
+    background-color: transparent;
+    color: inherit;
+    font-weight: normal;
+    line-height: normal;
+    padding: 0;
+    text-shadow: none;
+}
+
+.rickshaw_legend .action:hover {
+    opacity: 0.6;
+}
+
+.rickshaw_legend .action {
+    margin-right: 0.2em;
+    opacity: 0.2;
+    cursor: pointer;
+    font-size: 14px;
+}
+
+.rickshaw_legend .line.disabled {
+    opacity: 0.4;
+}
+
+.rickshaw_legend ul {
+    list-style-type: none;
+    padding: 0;
+    margin: 2px;
+    cursor: pointer;
+}
+
+.rickshaw_legend li {
+    padding: 0 0 0 2px;
+    min-width: 80px;
+    white-space: nowrap;
+}
+
+.rickshaw_legend li:hover {
+    background: rgba(255, 255, 255, 0.08);
+    border-radius: 3px;
+}
+
+.rickshaw_legend li:active {
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 3px;
+}
+
+.legend {
+    display: inline-block;
+    position: relative;
+    left: 8px;
+}
+
+.legend_container {
+    float: right;
+    padding-right: 10px;
+    width: 0;
+    z-index: 1;
+    position: relative;
+    opacity: 0.7;
+}
+
+.spaced {
+    margin-top: 20px !important;
+}
+

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.analytics/public/js/graph_util.js

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var fromDate, toDate, currentDay = new Date();
+var startDate = new Date(currentDay.getTime() - (60 * 60 * 24 * 100));
+var endDate = new Date(currentDay.getTime());
+
+function initDate() {
+    currentDay = new Date();
+}
+
+var DateRange = convertDate(startDate) + " to " + convertDate(endDate);
+
+$(document).ready(function () {
+    initDate();
+
+    $('#date-range').html(DateRange);
+    $('#date-range').dateRangePicker()
+            .bind('datepicker-apply', function (event, dateRange) {
+                      $(this).addClass('active');
+                      $(this).siblings().removeClass('active');
+                      fromDate = dateRange.date1 != "Invalid Date" ? dateRange.date1.getTime() / 1000 : null;
+                      toDate = dateRange.date2 != "Invalid Date" ? dateRange.date2.getTime() / 1000 : null;
+                      drawGraph(fromDate, toDate);
+                  }
+            );
+    setDateTime(currentDay.getTime() - 3600000, currentDay.getTime());
+    $('#hour-btn').addClass('active');
+});
+
+//hour
+$('#hour-btn').on('click', function () {
+    initDate();
+    setDateTime(currentDay.getTime() - 3600000, currentDay.getTime());
+});
+
+//12 hours
+$('#h12-btn').on('click', function () {
+    initDate();
+    setDateTime(currentDay.getTime() - (3600000 * 12), currentDay.getTime());
+});
+
+//24 hours
+$('#h24-btn').on('click', function () {
+    initDate();
+    setDateTime(currentDay.getTime() - (3600000 * 24), currentDay.getTime());
+});
+
+//48 hours
+$('#h48-btn').on('click', function () {
+    initDate();
+    setDateTime(currentDay.getTime() - (3600000 * 48), currentDay.getTime());
+});
+
+$('body').on('click', '.btn-group button', function (e) {
+    $(this).addClass('active');
+    $(this).siblings().removeClass('active');
+});
+
+function setDateTime(from, to) {
+    fromDate = from;
+    toDate = to;
+    startDate = new Date(from);
+    endDate = new Date(to);
+    DateRange = convertDate(startDate) + " to " + convertDate(endDate);
+    $('#date-range').html(DateRange);
+    var tzOffset = new Date().getTimezoneOffset() * 60 / 1000;
+    from += tzOffset;
+    to += tzOffset;
+
+    // the relevant import units needs to implement this.
+    drawGraph(parseInt(from / 1000), parseInt(to / 1000));
+}
+
+function convertDate(date) {
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var hour = date.getHours();
+    var minute = date.getMinutes();
+    return date.getFullYear() + '-' + (('' + month).length < 2 ? '0' : '') + month + '-' +
+           (('' + day).length < 2 ? '0' : '') + day + " " + (('' + hour).length < 2 ? '0' : '') +
+           hour + ":" + (('' + minute).length < 2 ? '0' : '') + minute;
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.type.view/view.js

@@ -39,9 +39,8 @@ function onRequest(context) {
     }
 
     return {
-        "deviceTypeViewUnitName": "cdmf.unit.device.type." + deviceType + ".type-view",
+        "deviceTypeViewUnitName": utility.getTenantedDeviceUnitName(deviceType, "type-view"),
         "deviceType": deviceType,
         "label" : configs["deviceType"]["label"]
     };
 }
-

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.js

@@ -17,6 +17,7 @@
  */
 
 function onRequest(context){
+    var utility = require("/app/modules/utility.js").utility;
     context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
         if (arguments.length < 3)
             throw new Error("Handlebars Helper equal needs 2 parameters");
@@ -28,6 +29,5 @@ function onRequest(context){
     });
 
     var deviceType = context.uriParams.deviceType;
-
+    return {"deviceViewUnitName": utility.getTenantedDeviceUnitName(deviceType, "device-view")};
-    return {"deviceViewUnitName" : "cdmf.unit.device.type." + deviceType + ".device-view"};
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs

@@ -100,18 +100,19 @@
                                 <th data-for="By Ownership" class="select-filter"></th>
                                 <th class="no-sort"></th>
                             </tr>
-                            <tr class="bulk-action-row">
+                            <!--TODO: Enable bulk action row after gain compatibility with iot operation bar-->
-                                <th colspan="7">
+                            <!--<tr class="bulk-action-row">-->
-                                    <div id="operation-bar" class="hidden">
+                            <!--<th colspan="7">-->
-                                        {{unit "mdm.unit.device.operation-bar"}}
+                            <!--<div id="operation-bar" class="hidden">-->
-                                    </div>
+                            <!--{{!unit "mdm.unit.device.operation-bar"}}-->
-                                    <div id="operation-guide" class="bs-callout bs-callout-info">
+                            <!--</div>-->
-                                        <h4>Enabling Device Operations</h4>
+                            <!--<div id="operation-guide" class="bs-callout bs-callout-info">-->
-                                        <p>To enable device operations, select the desired platform from above
+                            <!--<h4>Enabling Device Operations</h4>-->
-                                           filter.</p>
+                            <!--<p>To enable device operations, select the desired platform from above-->
-                                    </div>
+                            <!--filter.</p>-->
-                                </th>
+                            <!--</div>-->
-                            </tr>
+                            <!--</th>-->
+                            <!--</tr>-->
                             </thead>
                             <tbody id="ast-container">
 
@@ -325,8 +326,6 @@
 
 {{#zone "bottomJs"}}
     <script id="device-listing" data-current-user="{{currentUser.username}}" data-device-types="{{deviceTypes}}"
-            data-image-resource="{{@app.context}}/public/cdmf.unit.device.type."
-            src="{{@page.publicUri}}/templates/listing.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/listing.js"}}
 {{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js

@@ -35,8 +35,8 @@ function onRequest(context) {
     if (currentUser) {
         page.permissions = {};
         page.permissions.list = stringify(userModule.getUIPermissions());
-        if (userModule.isAuthorized("/permission/admin/device-mgt/admin/devices/add")) {
+        if (userModule.isAuthorized("/permission/admin/device-mgt/user/devices/add")) {
-            permissions.enroll = true;
+            page.permissions.enroll = true;
         }
         page.currentUser = currentUser;
         var deviceCount = 0;
@@ -58,7 +58,8 @@ function onRequest(context) {
                     deviceTypes.push({
                         "type": data[i].name,
                         "category": deviceType.category,
-                        "label": deviceType.label
+                                         "label": deviceType.label,
+                                         "thumb": utility.getDeviceThumb(data[i].name)
                     });
                 }
             }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js

@@ -70,7 +70,6 @@ $(document).ready(function () {
         addDeviceSelectedClass(this);
     });
 
-    var i;
     var permissionList = $("#permission").data("permission");
     for (var key in permissionList) {
         if (permissionList.hasOwnProperty(key)) {
@@ -97,7 +96,7 @@ $(document).ready(function () {
             console.log(message);
         }, function(message){
                 console.log(message.content);
-            });
+        });
     });
 });
 
@@ -163,10 +162,8 @@ function toTitleCase(str) {
 
 function loadDevices(searchType, searchParam){
     var deviceListing = $("#device-listing");
-    var deviceListingSrc = deviceListing.attr("src");
     var imageResource = deviceListing.data("image-resource");
     var currentUser = deviceListing.data("currentUser");
-    var frontEndPagination = false;
 
     var serviceURL;
     if ($.hasPermission("LIST_DEVICES")) {
@@ -206,6 +203,26 @@ function loadDevices(searchType, searchParam){
         return type;
     }
 
+    function getDeviceTypeCategory(type) {
+        var deviceTypes = deviceListing.data("deviceTypes");
+        for (var i = 0; i < deviceTypes.length; i++) {
+            if (deviceTypes[i].type == type) {
+                return deviceTypes[i].category;
+            }
+        }
+        return type;
+    }
+
+    function getDeviceTypeThumb(type) {
+        var deviceTypes = deviceListing.data("deviceTypes");
+        for (var i = 0; i < deviceTypes.length; i++) {
+            if (deviceTypes[i].type == type) {
+                return deviceTypes[i].thumb;
+            }
+        }
+        return type;
+    }
+
     $('#device-grid').datatables_extended ({
         serverSide: true,
         processing: false,
@@ -226,7 +243,7 @@ function loadDevices(searchType, searchParam){
         },
         columnDefs: [
             { targets: 0, data: 'name', className: 'remove-padding icon-only content-fill' , render: function ( data, type, row, meta ) {
-                return '<div class="thumbnail icon"><img class="square-element text fw " src="' + imageResource + row.type + '.type-view/images/thumb.png"/></div>';
+                return '<div class="thumbnail icon"><img class="square-element text fw " src="' + getDeviceTypeThumb(row.type) + '"/></div>';
             }},
             { targets: 1, data: 'name', className: 'fade-edge' , render: function ( name, type, row, meta ) {
                 var model = getPropertyValue(row.properties, 'DEVICE_MODEL');
@@ -238,7 +255,8 @@ function loadDevices(searchType, searchParam){
                 return html;
             }},
             { targets: 2, data: 'enrolmentInfo.owner', className: 'fade-edge remove-padding-top'},
-            { targets: 3, data: 'enrolmentInfo.status', className: 'fade-edge remove-padding-top' ,
+            {
+                targets: 3, data: 'enrolmentInfo.status', className: 'fade-edge remove-padding-top',
                 render: function ( status, type, row, meta ) {
                 var html;
                 switch (status) {
@@ -257,11 +275,22 @@ function loadDevices(searchType, searchParam){
                 }
                 return html;
             }},
-            { targets: 4, data: 'type' , className: 'fade-edge remove-padding-top'  ,
+            {
+                targets: 4, data: 'type', className: 'fade-edge remove-padding-top',
                 render: function ( status, type, row, meta ) {
                     return getDeviceTypeLabel(row.type);
-                }},
+                }
-            { targets: 5, data: 'enrolmentInfo.ownership' , className: 'fade-edge remove-padding-top' },
+            },
+            {
+                targets: 5, data: 'enrolmentInfo.ownership', className: 'fade-edge remove-padding-top',
+                render: function (status, type, row, meta) {
+                    if (getDeviceTypeCategory(row.type) == 'mobile') {
+                        return row.enrolmentInfo.ownership;
+                    } else {
+                        return null;
+                    }
+                }
+            },
             { targets: 6, data: 'enrolmentInfo.status' , className: 'text-right content-fill text-left-on-grid-view no-wrap' ,
                 render: function ( status, type, row, meta ) {
                 var deviceType = row.type;
@@ -271,6 +300,15 @@ function loadDevices(searchType, searchParam){
                     html = '<a href="device/' + deviceType + '?id=' + deviceIdentifier + '" data-click-event="remove-form"' +
                     ' class="btn padding-reduce-on-grid-view"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>' +
                         '<i class="fw fw-view fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">View</span></a>';
+                    html += '<a href="analytics?deviceId=' + deviceIdentifier + '&deviceType=' + deviceType + '&deviceName=' + row.name + '" ' +
+                            'data-click-event="remove-form" class="btn padding-reduce-on-grid-view"><span class="fw-stack">' +
+                            '<i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
+                            '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
+                    html += '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view edit-device-link" ' +
+                            'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType + '" data-devicename="' + row.name + '">' +
+                            '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>' +
+                            '<i class="fw fw-edit fw-stack-1x"></i></span>' +
+                            '<span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
                 }
                 return html;
             }}
@@ -285,6 +323,7 @@ function loadDevices(searchType, searchParam){
             var status = data.enrolmentInfo.status;
             var ownership = data.enrolmentInfo.ownership;
             var deviceType = data.type;
+            var category = getDeviceTypeCategory(deviceType);
             $.each($('td', row), function (colIndex) {
                 switch(colIndex) {
                     case 1:
@@ -304,18 +343,21 @@ function loadDevices(searchType, searchParam){
                     case 4:
                         $(this).attr('data-grid-label', "Type");
                         $(this).attr('data-search', deviceType);
-                        $(this).attr('data-display', deviceType);
+                        $(this).attr('data-display', getDeviceTypeLabel(deviceType));
                         break;
                     case 5:
-                        $(this).attr('data-grid-label', "Ownership");
+                        if (category == 'mobile') {
-                        $(this).attr('data-search', ownership);
+                            $(this).attr('data-grid-label', "Ownership");
-                        $(this).attr('data-display', ownership);
+                            $(this).attr('data-search', ownership);
+                            $(this).attr('data-display', ownership);
+                        }
                         break;
                 }
             });
         },
         "fnDrawCallback": function( oSettings ) {
             $(".icon .text").res_text(0.2);
+            attachDeviceEvents();
         }
     });
     $(deviceCheckbox).click(function () {
@@ -338,50 +380,6 @@ function openCollapsedNav() {
     });
 }
 
-function loadGroupedDevices(groupId) {
-    var serviceURL = "api/group/id/" + groupId + "/device/all";
-    var deviceListing = $("#device-listing");
-    var deviceListingSrc = deviceListing.attr("src");
-    var imageResource = deviceListing.data("image-resource");
-    var currentUser = deviceListing.data("currentUser");
-    $.template("device-listing", deviceListingSrc, function (template) {
-
-        var loadGroupRequest = $.ajax({
-                                          url: serviceURL,
-                                          method: "GET",
-                                          contentType: "application/json",
-                                          accept: "application/json"
-                                      });
-
-        loadGroupRequest.done(function (data) {
-            data = JSON.parse(data);
-            var viewModel = {};
-            viewModel.devices = data.data;
-            viewModel.imageLocation = imageResource;
-            viewModel.isGroupView = "true";
-            if (viewModel.devices.length > 0) {
-                $('#device-grid').removeClass('hidden');
-                var content = template(viewModel);
-                $("#ast-container").html(content);
-                /*
-                 * On device checkbox select add parent selected style class
-                 */
-                $(deviceCheckbox).click(function () {
-                    addDeviceSelectedClass(this);
-                });
-                attachDeviceEvents();
-            } else {
-                $('#device-table').addClass('hidden');
-                $('#device-listing-status-msg').text('No device is available to be displayed.');
-            }
-            $("#loading-content").remove();
-            $('#device-grid').datatables_extended();
-            $(".icon .text").res_text(0.2);
-        });
-    });
-
-}
-
 function initPage() {
     var deviceListing = $("#device-listing");
     var currentUser = deviceListing.data("currentUser");
@@ -594,21 +592,19 @@ function attachDeviceEvents() {
     $("a.remove-device-link").click(function () {
         var deviceId = $(this).data("deviceid");
         var deviceType = $(this).data("devicetype");
-        var removeDeviceAPI = "/devicemgt/api/devices/" + deviceType + "/" + deviceId + "/remove";
+        var serviceURL = "/devicemgt_admin/devices/type/" + deviceType + "/id/" + deviceId;
 
         $(modalPopupContent).html($('#remove-device-modal-content').html());
         showPopup();
 
         $("a#remove-device-yes-link").click(function () {
-            var postOperationRequest = $.ajax({
+            invokerUtil.delete(serviceURL, function (message) {
-                                                  url: removeDeviceAPI,
-                                                  method: "post"
-                                              });
-            postOperationRequest.done(function (data) {
                 $(modalPopupContent).html($('#remove-device-200-content').html());
-                window.location.reload(false);
+                setTimeout(function () {
-            });
+                    hidePopup();
-            postOperationRequest.fail(function (jqXHR, textStatus) {
+                    location.reload(false);
+                }, 2000);
+            }, function (message) {
                 displayDeviceErrors(jqXHR);
             });
         });
@@ -616,7 +612,6 @@ function attachDeviceEvents() {
         $("a#remove-device-cancel-link").click(function () {
             hidePopup();
         });
-
     });
 
     /**
@@ -628,7 +623,7 @@ function attachDeviceEvents() {
         var deviceId = $(this).data("deviceid");
         var deviceType = $(this).data("devicetype");
         var deviceName = $(this).data("devicename");
-        var editDeviceAPI = "/devicemgt/api/devices/" + deviceType + "/" + deviceId + "/update?name=";
+        var serviceURL = "/devicemgt_admin/devices/type/" + deviceType + "/id/" + deviceId;
 
         $(modalPopupContent).html($('#edit-device-modal-content').html());
         $('#edit-device-name').val(deviceName);
@@ -636,18 +631,13 @@ function attachDeviceEvents() {
 
         $("a#edit-device-yes-link").click(function () {
             var newDeviceName = $('#edit-device-name').val();
-            var postOperationRequest = $.ajax({
+            invokerUtil.put(serviceURL, {"name": newDeviceName}, function (message) {
-                                                  url: editDeviceAPI + newDeviceName,
-                                                  method: "post"
-                                              });
-            postOperationRequest.done(function (data) {
                 $(modalPopupContent).html($('#edit-device-200-content').html());
-                $("h4[data-deviceid='" + deviceId + "']").html(newDeviceName);
                 setTimeout(function () {
                     hidePopup();
+                    location.reload(false);
                 }, 2000);
-            });
+            }, function (message) {
-            postOperationRequest.fail(function (jqXHR, textStatus) {
                 displayDeviceErrors(jqXHR);
             });
         });

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs

@@ -17,15 +17,17 @@
 {{/zone}}
 
 {{#zone "navbarActions"}}
-    <li>
+    {{#if permissions.ADD_GROUP}}
-        <a href="{{@app.context}}/group/add" class="cu-btn">
+        <li>
+            <a href="{{@app.context}}/group/add" class="cu-btn">
             <span class="icon fw-stack">
                 <i class="fw fw-add fw-stack-1x"></i>
                 <i class="fw fw-ring fw-stack-2x"></i>
             </span>
-            Add Group
+                Add Group
-        </a>
+            </a>
-    </li>
+        </li>
+    {{/if}}
 {{/zone}}
 
 {{#zone "content"}}
@@ -33,6 +35,7 @@
         <div class="wr-hidden-operations wr-advance-operations"></div>
         <div class="col-md-12 wr-page-content">
             <div>
+                <span id="permission" data-permission="{{permissions.list}}"></span>
                 {{#if groupCount}}
                     <div class="container-fluid">
                         <table class="table table-striped table-hover list-table display responsive nowrap data-table table-selectable grid-view"

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.js

@@ -21,14 +21,15 @@ function onRequest(context) {
     var userModule = require("/app/modules/user.js").userModule;
     var constants = require("/app/modules/constants.js");
     var currentUser = session.get(constants.USER_SESSION_KEY);
-    var page_data = {};
+    var page = {};
     if (currentUser) {
-        page_data.permissions = userModule.getUIPermissions();
+        page.permissions = userModule.getUIPermissions();
-        page_data.currentUser = currentUser;
+        page.permissions.list = stringify(page.permissions);
+        page.currentUser = currentUser;
         var groupCount = groupModule.getGroupCount();
         if (groupCount > 0) {
-            page_data.groupCount = groupCount;
+            page.groupCount = groupCount;
         }
     }
-    return page_data;
+    return page;
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js

@@ -82,6 +82,19 @@ function toTitleCase(str) {
     });
 }
 
+(function () {
+    var permissionSet = {};
+
+    //This method is used to setup permission for device listing
+    $.setPermission = function (permission) {
+        permissionSet[permission] = true;
+    };
+
+    $.hasPermission = function (permission) {
+        return permissionSet[permission];
+    };
+})();
+
 function loadGroups() {
     var groupListing = $("#group-listing");
     var groupListingSrc = groupListing.attr("src");
@@ -108,10 +121,23 @@ function loadGroups() {
             $(".icon .text").res_text(0.2);
         };
 
-        invokerUtil.get("/devicemgt_admin/groups/user/" + currentUser + "?start=0&rowCount=1000",
+        var serviceURL;
-                        successCallback, function (message) {
+        if ($.hasPermission("LIST_ALL_GROUPS")) {
-                    displayErrors(message.content);
+            serviceURL = "/devicemgt_admin/groups?start=0&rowCount=1000";
-                });
+        } else if ($.hasPermission("LIST_GROUPS")) {
+            //Get authenticated users groups
+            serviceURL = "/devicemgt_admin/groups/user/" + currentUser + "?start=0&rowCount=1000";
+        } else {
+            $("#loading-content").remove();
+            $('#device-table').addClass('hidden');
+            $('#device-listing-status-msg').text('Permission denied.');
+            $("#device-listing-status").removeClass(' hidden');
+            return;
+        }
+
+        invokerUtil.get(serviceURL, successCallback, function (message) {
+            displayErrors(message.content);
+        });
 
     });
 }
@@ -129,6 +155,13 @@ function openCollapsedNav() {
  * DOM ready functions.
  */
 $(document).ready(function () {
+    var permissionList = $("#permission").data("permission");
+    for (var key in permissionList) {
+        if (permissionList.hasOwnProperty(key)) {
+            $.setPermission(key);
+        }
+    }
+
     loadGroups();
     //$('#device-grid').datatables_extended();
 
@@ -138,30 +171,36 @@ $(document).ready(function () {
     });
 
     /* for device list sorting drop down */
-    $(".ctrl-filter-type-switcher").popover({
+    $(".ctrl-filter-type-switcher").popover(
-                                                html: true,
+            {
-                                                content: function () {
+                html: true,
-                                                    return $("#content-filter-types").html();
+                content: function () {
-                                                }
+                    return $("#content-filter-types").html();
-                                            });
+                }
+            }
+    );
 
     /* for data tables*/
     $('[data-toggle="tooltip"]').tooltip();
 
     $("[data-toggle=popover]").popover();
 
-    $(".ctrl-filter-type-switcher").popover({
+    $(".ctrl-filter-type-switcher").popover(
-                                                html: true,
+            {
-                                                content: function () {
+                html: true,
-                                                    return $('#content-filter-types').html();
+                content: function () {
-                                                }
+                    return $('#content-filter-types').html();
-                                            });
+                }
+            }
+    );
 
-    $('#nav').affix({
+    $('#nav').affix(
-                        offset: {
+            {
-                            top: $('header').height()
+                offset: {
-                        }
+                    top: $('header').height()
-                    });
+                }
+            }
+    );
 
 });
 
@@ -212,12 +251,14 @@ function attachEvents() {
         $('#user-names').html('<div style="height:100px" data-state="loading" data-loading-text="Loading..." data-loading-style="icon-only" data-loading-inverse="true"></div>');
         showPopup();
         $("a#share-group-next-link").hide();
-        var userRequest = $.ajax({
+        var userRequest = $.ajax(
-                                     url: "api/user/all",
+                {
-                                     method: "GET",
+                    url: "api/user/all",
-                                     contentType: "application/json",
+                    method: "GET",
-                                     accept: "application/json"
+                    contentType: "application/json",
-                                 });
+                    accept: "application/json"
+                }
+        );
         userRequest.done(function (data, txtStatus, jqxhr) {
             var users = JSON.parse(data);
             var status = jqxhr.status;
@@ -318,10 +359,9 @@ function attachEvents() {
             var successCallback = function (data) {
                 data = JSON.parse(data);
                 if (data.status == 200) {
-                    $(modalPopupContent).html($('#edit-group-200-content').html());
-                    $("h4[data-groupid='" + groupId + "']").html(newGroupName);
                     setTimeout(function () {
                         hidePopup();
+                        location.reload(false);
                     }, 2000);
                 } else {
                     displayErrors(status);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.create.wizard/wizard.js

@@ -16,11 +16,13 @@
  * under the License.
  */
 
-function onRequest(context){
+function onRequest(context) {
+    var utility = require("/app/modules/utility.js").utility;
     context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
-        if (arguments.length < 3)
+        if (arguments.length < 3) {
             throw new Error("Handlebars Helper equal needs 2 parameters");
-        if( lvalue!=rvalue ) {
+        }
+        if (lvalue != rvalue) {
             return options.inverse(this);
         } else {
             return options.fn(this);
@@ -28,5 +30,5 @@ function onRequest(context){
     });
     var deviceType = context.uriParams.deviceType;
 
-    return {"policyWizardUnitName" : "cdmf.unit.device.type." + deviceType + ".policy-wizard"};
+    return {"policyWizardUnitName": utility.getTenantedDeviceUnitName(deviceType, "policy-wizard")};
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.edit/edit.js

@@ -17,6 +17,7 @@
  */
 
 function onRequest(context) {
+    var utility = require("/app/modules/utility.js").utility;
     var deviceType = request.getParameter("type");
-    return {"deviceTypePolicyEdit" : "cdmf.unit.device.type." + deviceType + ".policy-edit"};
+    return {"deviceTypePolicyEdit": utility.getTenantedDeviceUnitName(deviceType, "policy-edit")};
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.view/view.js

@@ -17,6 +17,7 @@
  */
 
 function onRequest(context) {
+    var utility = require("/app/modules/utility.js").utility;
     var deviceType = request.getParameter("type");
-    return {"deviceTypePolicyView" : "cdmf.unit.device.type." + deviceType + ".policy-view"};
+    return {"deviceTypePolicyView": utility.getTenantedDeviceUnitName(deviceType, "policy-view")};
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -78,7 +78,8 @@ $.fn.datatables_extended = function(settings){
                                         $( "#operation-guide" ).hide();
                                         $( "#operation-bar" ).removeClass("hidden");
                                         $("#operation-bar").show();
-                                        loadOperationBar(val);
+                                        //TODO: Enable after adding iot operations bar
+                                        //loadOperationBar(val);
                                     }
 
                                 }
@@ -86,13 +87,14 @@ $.fn.datatables_extended = function(settings){
 
                         $(column).each(function () {
                             if ($(column.nodes()).attr('data-search')) {
-                                var titles = [];
+                                var values = [];
                                 column.nodes().unique().sort().each(function (d, j) {
                                     var title = $(d).attr('data-display');
-                                    if ($.inArray(title, titles) < 0) {
+                                    var value = $(d).attr('data-search');
-                                        titles.push(title);
+                                    if ($.inArray(value, values) < 0) {
-                                        if (title !== undefined) {
+                                        values.push(value);
-                                            select.append('<option value="' + title + '">' + title + '</option>')
+                                        if (value !== undefined) {
+                                            select.append('<option value="' + value + '">' + title + '</option>')
                                         }
                                     }
                                 });

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs

@@ -43,8 +43,7 @@
                     </button>
                                            our {{deviceTypeLabel}} device
                 </p>
-                <img class="try-device-image"
+                <img class="try-device-image" src="{{thumb}}">
-                     src="{{@app.context}}/public/cdmf.unit.device.type.{{deviceTypeName}}.type-view/images/thumb.png">
             </div>
         </div>
     {{/each}}
@@ -55,8 +54,6 @@
 {{/zone}}
 {{#zone "bottomJs"}}
     <script id="device-listing" data-current-user="{{currentUser.username}}"
-        {{! /devicemgt/public/cdmf.unit.device.type.android}}
-            data-image-resource="{{@app.context}}/public/cdmf.unit.device.type."
             src="{{@unit.publicUri}}/templates/listing.hbs"
             type="text/x-handlebars-template"></script>
     <script type="text/javascript">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js

@@ -42,21 +42,23 @@ function onRequest(context) {
                     deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY];
                 }
             }
-            if (deviceCategory == 'virtual'){
+            if (deviceCategory == 'virtual') {
                 virtualDeviceTypesList.push({
                     "hasCustTemplate": false,
                     "deviceTypeLabel": deviceTypeLabel,
                     "deviceTypeName": deviceTypes[i].name,
                     "deviceCategory": deviceCategory,
-                    "deviceTypeId": deviceTypes[i].id
+                                                "deviceTypeId": deviceTypes[i].id,
+                                                "thumb": utility.getDeviceThumb(deviceTypes[i].name)
                 });
-            }else{
+            } else {
                 deviceTypesList.push({
                     "hasCustTemplate": false,
                     "deviceTypeLabel": deviceTypeLabel,
                     "deviceTypeName": deviceTypes[i].name,
                     "deviceCategory": deviceCategory,
-                    "deviceTypeId": deviceTypes[i].id
+                                         "deviceTypeId": deviceTypes[i].id,
+                                         "thumb": utility.getDeviceThumb(deviceTypes[i].name)
                 });
             }
         }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js

@@ -125,7 +125,6 @@ var deviceTypeCount, compiledDeviceTypesCount = 0;
 function loadDevices(searchType, searchParam){
     var deviceListing = $("#device-listing");
     var deviceListingSrc = deviceListing.attr("src");
-    var imageResource = deviceListing.data("image-resource");
     var currentUser = deviceListing.data("currentUser");
 
     $('#ast-container').html("");
@@ -133,7 +132,7 @@ function loadDevices(searchType, searchParam){
     if(deviceTypesList.length > 0){
         for (var i = 0; i < deviceTypesList.length; i++) {
             var viewModel = {};
-            viewModel.imageLocation = imageResource;
+            viewModel.thumb = deviceTypesList[i].thumb;
             viewModel.appContext = clientJsAppContext;
             viewModel.deviceTypeName = deviceTypesList[i].deviceTypeName;
             viewModel.deviceTypeId = deviceTypesList[i].deviceTypeId;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs

@@ -3,7 +3,7 @@
     <td class="remove-padding icon-only content-fill" data-search="{{deviceCategory}}" data-display="{{deviceCategory}}">
         <div class="thumbnail icon">
                 <!--<i class="square-element text fw fw-mobile"></i>-->
-                <img class="square-element text fw " src="{{imageLocation}}{{deviceTypeName}}.type-view/images/thumb.png" />
+            <img class="square-element text fw" src="{{thumb}}"/>
         </div>
     </td>
     <td class="remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.js

@@ -17,19 +17,12 @@
  */
 
 function onRequest(context) {
-    var log = new Log("create.js");
     var DTYPE_CONF_DEVICE_TYPE_KEY = "deviceType";
     var DTYPE_CONF_DEVICE_TYPE_LABEL_KEY = "label";
 
     var utility = require("/app/modules/utility.js").utility;
     var userModule = require("/app/modules/user.js")["userModule"];
 
-    var JFile = Packages.java.io.File;
-    var sep = JFile.separator;
-
-    var systemProcess = require('process');
-    var parent = 'file:///' + (systemProcess.getProperty('jaggery.home') ||
-                               systemProcess.getProperty('carbon.home')).replace(/[\\]/g, '/').replace(/^[\/]/g, '');
     var types = {};
     types["types"] = [];
     var typesListResponse = userModule.getPlatforms();
@@ -41,9 +34,7 @@ function onRequest(context) {
             if (configs && configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]) {
                 deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY];
             }
-            var policyWizard = new File(parent + sep + "repository" + sep + "deployment" + sep + "server" + sep +
+            var policyWizard = new File("/app/units/" + utility.getTenantedDeviceUnitName(deviceType, "policy-wizard"));
-                                        "jaggeryapps" + sep + "devicemgt" + sep + "app" + sep + "units" + sep +
-                                        "cdmf.unit.device.type." + deviceType + ".policy-wizard");
             if(policyWizard.isExists()){
                 typesListResponse["content"][type]["icon"] = utility.getDeviceThumb(deviceType);
                 typesListResponse["content"][type]["label"] = deviceTypeLabel;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs

@@ -8,7 +8,7 @@
             <a href="{{@app.context}}"><i class="fw fw-dashboard"></i>Admin Dashboard</a>
         </li>
     {{/if}}
-    {{#if permissions.LIST_DEVICES}}
+    {{#if permissions.LIST_OWN_DEVICES}}
         <li>
             <a href="{{@app.context}}/devices"><i class="fw fw-mobile"></i>Device Management</a>
         </li>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css

@@ -2193,7 +2193,7 @@ input[type=number].form-control {
 }
 
 .table.list-table.grid-view .padding-reduce-on-grid-view {
-  padding: 2px;
+    padding: 1px;
 }
 
 .table.list-table.grid-view .text-left-on-grid-view {
@@ -6428,7 +6428,7 @@ body.inverse .fade-edge:after {
     display: none;
 }
 .table.list-table.grid-view .padding-reduce-on-grid-view {
-    padding: 2px;
+    padding: 1px;
 }
 .table.list-table.grid-view .text-left-on-grid-view {
     text-align: left;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.user.view/view.hbs

@@ -91,7 +91,7 @@
                                                         <span class="wr-list-icon">
                                                             <div class="thumbnail icon">
                                                                 <img class="square-element text fw "
-                                                                     src="{{@app.context}}/public/cdmf.unit.device.type.{{type}}.type-view/images/thumb.png"/>
+                                                                     src="{{thumb}}"/>
                                                             </div>
                                                         </span>
                                                         <span class="wr-list-desc">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.user.view/view.js

@@ -41,9 +41,8 @@ function onRequest(context) {
         if (response["status"] == "success") {
             userRoles = response["content"];
         }
-
         var deviceModule = require("/app/modules/device.js").deviceModule;
-        devices = deviceModule.listDevicesForUser(userName);
+        devices = deviceModule.getDevices(userName);
     }
     return {"user": user, "userRoles": userRoles, "devices": devices};
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/internal/PolicyManagementServiceComponent.java

@@ -87,10 +87,8 @@ public class PolicyManagementServiceComponent {
             componentContext.getBundleContext().registerService(
                     PolicyManagerService.class.getName(), new PolicyManagerServiceImpl(), null);
 
-
+            PolicyConfiguration policyConfiguration =
-
+                    DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
-            PolicyConfiguration policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
-                    getDeviceManagementConfigRepository().getPolicyConfiguration();
             if(policyConfiguration.getMonitoringEnable()) {
                 TaskScheduleService taskScheduleService = new TaskScheduleServiceImpl();
                 taskScheduleService.startTask(PolicyManagerUtil.getMonitoringFequency());
@@ -104,8 +102,8 @@ public class PolicyManagementServiceComponent {
     @SuppressWarnings("unused")
     protected void deactivate(ComponentContext componentContext) {
         try {
-            PolicyConfiguration policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+            PolicyConfiguration policyConfiguration =
-                    getDeviceManagementConfigRepository().getPolicyConfiguration();
+                    DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
             if (policyConfiguration.getMonitoringEnable()) {
                 TaskScheduleService taskScheduleService = new TaskScheduleServiceImpl();
                 taskScheduleService.stopTask();

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java

@@ -72,9 +72,8 @@ public class MonitoringManagerImpl implements MonitoringManager {
         this.deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO();
         this.monitoringDAO = PolicyManagementDAOFactory.getMonitoringDAO();
         this.complianceDecisionPoint = new ComplianceDecisionPointImpl();
-        this.policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+        this.policyConfiguration =
-                getDeviceManagementConfigRepository().getPolicyConfiguration();
+                DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
-
     }
 
     @Override

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/TaskScheduleServiceImpl.java

@@ -43,8 +43,8 @@ public class TaskScheduleServiceImpl implements TaskScheduleService {
 
 
     public TaskScheduleServiceImpl() {
-        this.policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+        this.policyConfiguration =
-                getDeviceManagementConfigRepository().getPolicyConfiguration();
+                DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
     }
 
     @Override

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java

@@ -219,7 +219,7 @@ public class PolicyManagerUtil {
 
         if (monitoringFrequency == 0) {
             PolicyConfiguration policyConfiguration = DeviceConfigurationManager.getInstance().
-                    getDeviceManagementConfig().getDeviceManagementConfigRepository().getPolicyConfiguration();
+                    getDeviceManagementConfig().getPolicyConfiguration();
             monitoringFrequency = policyConfiguration.getMonitoringFrequency();
         }
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml

@@ -24,38 +24,38 @@
                 <Name>jdbc/DM_DS</Name>
             </JndiLookupDefinition>
         </DataSourceConfiguration>
-        <IdentityConfiguration>
-            <ServerUrl>https://localhost:9443</ServerUrl>
-            <AdminUsername>admin</AdminUsername>
-            <AdminPassword>admin</AdminPassword>
-        </IdentityConfiguration>
-        <PolicyConfiguration>
-            <monitoringClass>org.wso2.carbon.policy.mgt</monitoringClass>
-            <monitoringEnable>true</monitoringEnable>
-            <monitoringFrequency>60000</monitoringFrequency>
-            <maxRetries>5</maxRetries>
-            <minRetriesToMarkUnreachable>8</minRetriesToMarkUnreachable>
-            <minRetriesToMarkInactive>20</minRetriesToMarkInactive>
-        </PolicyConfiguration>
-        <TaskConfiguration>
-            <Enable>true</Enable>
-            <Frequency>600000</Frequency>
-            <TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
-            <Operations>
-                <Operation>
-                    <Name>DEVICE_INFO</Name>
-                    <RecurrentTimes>1</RecurrentTimes>
-                </Operation>
-                <Operation>
-                    <Name>APPLICATION_LIST</Name>
-                    <RecurrentTimes>5</RecurrentTimes>
-                </Operation>
-                <Operation>
-                    <Name>DEVICE_LOCATION</Name>
-                    <RecurrentTimes>1</RecurrentTimes>
-                </Operation>
-            </Operations>
-        </TaskConfiguration>
     </ManagementRepository>
+    <IdentityConfiguration>
+        <ServerUrl>https://localhost:9443</ServerUrl>
+        <AdminUsername>admin</AdminUsername>
+        <AdminPassword>admin</AdminPassword>
+    </IdentityConfiguration>
+    <PolicyConfiguration>
+        <MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
+        <MonitoringEnable>true</MonitoringEnable>
+        <MonitoringFrequency>60000</MonitoringFrequency>
+        <MaxRetries>5</MaxRetries>
+        <MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
+        <MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
+    </PolicyConfiguration>
+    <TaskConfiguration>
+        <Enable>true</Enable>
+        <Frequency>600000</Frequency>
+        <TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
+        <Operations>
+            <Operation>
+                <Name>DEVICE_INFO</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>APPLICATION_LIST</Name>
+                <RecurrentTimes>5</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>DEVICE_LOCATION</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+        </Operations>
+    </TaskConfiguration>
 </DeviceMgtConfiguration>