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

components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Annotations</name>
     <description>WSO2 Carbon - API Management Custom Annotation Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml

@@ -21,12 +21,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Application Management API</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml

@@ -22,12 +22,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Application Management</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Security Handler Component</name>
     <description>WSO2 Carbon - API Management Security Handler Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<artifactId>apimgt-extensions</artifactId>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<version>2.0.72-SNAPSHOT</version>
+		<version>2.0.75-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>
-	<version>2.0.72-SNAPSHOT</version>
+	<version>2.0.75-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - API Management Integration Client</name>
 	<description>WSO2 Carbon - API Management Integration Client</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<artifactId>apimgt-extensions</artifactId>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<version>2.0.72-SNAPSHOT</version>
+		<version>2.0.75-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>
-	<version>2.0.72-SNAPSHOT</version>
+	<version>2.0.75-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - API Management Integration Generated Client</name>
 	<description>WSO2 Carbon - API Management Integration Client</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>

components/apimgt-extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Component</name>
     <url>http://wso2.org</url>

components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>

components/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Component</name>
     <url>http://wso2.org</url>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java

@@ -57,7 +57,7 @@ public class FCMNotificationStrategy implements NotificationStrategy {
     public void execute(NotificationContext ctx) throws PushNotificationExecutionFailedException {
         try {
             Device device =
-                    FCMDataHolder.getInstance().getDeviceManagementProviderService().getDevice(ctx.getDeviceId());
+                    FCMDataHolder.getInstance().getDeviceManagementProviderService().getDeviceWithTypeProperties(ctx.getDeviceId());
             this.sendWakeUpCall(ctx.getOperation().getCode(), device);
         } catch (DeviceManagementException e) {
             throw new PushNotificationExecutionFailedException("Error occurred while retrieving device information", e);

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -267,6 +267,13 @@ public interface DeviceManagementService {
                     required = false)
             @HeaderParam("If-Modified-Since")
             String timestamp,
+            @ApiParam(
+                    name = "requireDeviceInfo",
+                    value = "Boolean flag indicating whether to include device-info (location, application list etc) \n" +
+                            " to the device object.",
+                    required = false)
+            @QueryParam("requireDeviceInfo")
+                    boolean requireDeviceInfo,
             @ApiParam(
                     name = "offset",
                     value = "The starting pagination index for the complete list of qualified items.",
@@ -333,6 +340,13 @@ public interface DeviceManagementService {
     })
     @Path("/user-devices")
     Response getDeviceByUser(
+            @ApiParam(
+                    name = "requireDeviceInfo",
+                    value = "Boolean flag indicating whether to include device-info (location, application list etc) \n" +
+                            " to the device object.",
+                    required = false)
+            @QueryParam("requireDeviceInfo")
+                    boolean requireDeviceInfo,
             @ApiParam(
                     name = "offset",
                     value = "The starting pagination index for the complete list of qualified items.",

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java

@@ -83,6 +83,10 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
         long timestamp = 0;
         boolean isIfModifiedSinceSet = false;
         boolean isSinceSet = false;
+        if (log.isDebugEnabled()) {
+            log.debug("getActivities since: " + since + " , offset: " + offset + " ,limit: " + limit + " ," +
+                    "ifModifiedSince: " + ifModifiedSince);
+        }
         RequestValidationUtil.validatePaginationParameters(offset, limit);
         if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
             Date ifSinceDate;
@@ -112,14 +116,32 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
             timestamp = sinceTimestamp / 1000;
         }
 
+        if (timestamp == 0) {
+            //If timestamp is not sent by the user, a default value is set, that is equal to current time-12 hours.
+            long time = System.currentTimeMillis() / 1000;
+            timestamp = time - 42300;
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("getActivities final timestamp " + timestamp);
+        }
+
         List<Activity> activities;
         ActivityList activityList = new ActivityList();
         DeviceManagementProviderService dmService;
         try {
+            if (log.isDebugEnabled()) {
+                log.debug("Calling database to get activities.");
+            }
             dmService = DeviceMgtAPIUtils.getDeviceManagementService();
             activities = dmService.getActivitiesUpdatedAfter(timestamp, limit, offset);
             activityList.setList(activities);
+            if (log.isDebugEnabled()) {
+                log.debug("Calling database to get activity count.");
+            }
             int count = dmService.getActivityCountUpdatedAfter(timestamp);
+            if (log.isDebugEnabled()) {
+                log.debug("Activity count: " + count);
+            }
             activityList.setCount(count);
             if (activities == null || activities.size() == 0) {
                 if (isIfModifiedSinceSet) {

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -18,7 +18,6 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 
-import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -97,6 +96,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             @QueryParam("groupId") int groupId,
             @QueryParam("since") String since,
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
+            @QueryParam("requireDeviceInfo") boolean requireDeviceInfo,
             @QueryParam("offset") int offset,
             @QueryParam("limit") int limit) {
         try {
@@ -180,7 +180,12 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                                     "string is provided in 'If-Modified-Since' header").build()).build();
                 }
                 request.setSince(sinceDate);
+                if (requireDeviceInfo) {
                     result = dms.getAllDevices(request);
+                } else {
+                    result = dms.getAllDevices(request, false);
+                }
+
                 if (result == null || result.getData() == null || result.getData().size() <= 0) {
                     return Response.status(Response.Status.NOT_MODIFIED).entity("No device is modified " +
                             "after the timestamp provided in 'If-Modified-Since' header").build();
@@ -196,14 +201,22 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                                     "string is provided in 'since' filter").build()).build();
                 }
                 request.setSince(sinceDate);
+                if (requireDeviceInfo) {
                     result = dms.getAllDevices(request);
+                } else {
+                    result = dms.getAllDevices(request, false);
+                }
                 if (result == null || result.getData() == null || result.getData().size() <= 0) {
                     devices.setList(new ArrayList<Device>());
                     devices.setCount(0);
                     return Response.status(Response.Status.OK).entity(devices).build();
                 }
             } else {
+                if (requireDeviceInfo) {
                     result = dms.getAllDevices(request);
+                } else {
+                    result = dms.getAllDevices(request, false);
+                }
                 int resultCount = result.getRecordsTotal();
                 if (resultCount == 0) {
                     Response.status(Response.Status.OK).entity(devices).build();
@@ -229,7 +242,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     @GET
     @Override
     @Path("/user-devices")
-    public Response getDeviceByUser(@QueryParam("offset") int offset,
+    public Response getDeviceByUser(@QueryParam("requireDeviceInfo") boolean requireDeviceInfo,
+                                    @QueryParam("offset") int offset,
                                     @QueryParam("limit") int limit) {
 
         RequestValidationUtil.validatePaginationParameters(offset, limit);
@@ -241,7 +255,11 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         request.setOwner(currentUser);
 
         try {
+            if (requireDeviceInfo) {
                 result = DeviceMgtAPIUtils.getDeviceManagementService().getDevicesOfUser(request);
+            } else {
+                result = DeviceMgtAPIUtils.getDeviceManagementService().getDevicesOfUser(request, false);
+            }
             devices.setList((List<Device>) result.getData());
             devices.setCount(result.getRecordsTotal());
             return Response.status(Response.Status.OK).entity(devices).build();
@@ -261,7 +279,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                 DeviceMgtAPIUtils.getDeviceManagementService();
         try {
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier(deviceId, deviceType);
-            Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier);
+            Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, true);
             if (persistedDevice == null) {
                 return Response.status(Response.Status.NOT_FOUND).build();
             }
@@ -287,7 +305,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         DeviceManagementProviderService deviceManagementProviderService = DeviceMgtAPIUtils.getDeviceManagementService();
         try {
             Device persistedDevice = deviceManagementProviderService.getDevice(new DeviceIdentifier
-                    (deviceId, deviceType));
+                    (deviceId, deviceType), true);
             persistedDevice.setName(device.getName());
             boolean response = deviceManagementProviderService.modifyEnrollment(persistedDevice);
             return Response.status(Response.Status.CREATED).entity(response).build();
@@ -586,7 +604,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                 DeviceMgtAPIUtils.getDeviceManagementService();
         try {
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier(id, type);
-            Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier);
+            Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, false);
             if (persistedDevice == null) {
                 return Response.status(Response.Status.NOT_FOUND).build();
             }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/PolicyManagementServiceImpl.java

@@ -128,7 +128,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
         List<DeviceIdentifier> deviceIdentifiers = policyWrapper.getDeviceIdentifiers();
         if (deviceIdentifiers != null) {
             for (DeviceIdentifier id : deviceIdentifiers) {
-                devices.add(DeviceMgtAPIUtils.getDeviceManagementService().getDevice(id));
+                devices.add(DeviceMgtAPIUtils.getDeviceManagementService().getDevice(id, false));
             }
         }
         policy.setDevices(devices);

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java

@@ -25,6 +25,7 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceManagementAdminService;
@@ -64,8 +65,11 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
             PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain);
             PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(DeviceMgtAPIUtils.getTenantId(tenantDomain));
 
+            PaginationRequest request = new PaginationRequest(offset, limit);
+            request.setDeviceType(type);
+            request.setDeviceName(name);
             List<Device> devices = DeviceMgtAPIUtils.getDeviceManagementService().
-                    getDevicesByNameAndType(name, type, offset, limit);
+                    getDevicesByNameAndType(request, false);
 
             // setting up paginated result
             DeviceList deviceList = new DeviceList();

components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -114,7 +114,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             for (String user : userNameList) {
                 userName = user;
                 deviceList = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevicesOfUser
-                        (user);
+                        (user, false);
                 for (Device device : deviceList) {
                     deviceIdentifier = new DeviceIdentifier();
                     deviceIdentifier.setId(Integer.toString(device.getId()));
@@ -156,7 +156,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             for (String role : userRoleList) {
                 userRole = role;
                 deviceList = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider()
-                        .getAllDevicesOfRole(userRole);
+                        .getAllDevicesOfRole(userRole, false);
                 for (Device device : deviceList) {
                     deviceIdentifier = new DeviceIdentifier();
                     deviceIdentifier.setId(Integer.toString(device.getId()));

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java

@@ -61,7 +61,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
     public void addDeviceInfo(DeviceIdentifier deviceId, DeviceInfo deviceInfo) throws DeviceDetailsMgtException {
         try {
             Device device = DeviceManagementDataHolder.getInstance().
-                    getDeviceManagementProvider().getDevice(deviceId);
+                    getDeviceManagementProvider().getDevice(deviceId, false);
 
             DeviceManagementDAOFactory.beginTransaction();
             deviceDAO.updateDevice(device, CarbonContext.getThreadLocalCarbonContext().getTenantId());
@@ -93,7 +93,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
         Device device;
         try {
             device = DeviceManagementDataHolder.getInstance().
-                    getDeviceManagementProvider().getDevice(deviceId);
+                    getDeviceManagementProvider().getDevice(deviceId, false);
             if (device == null) {
                 if (log.isDebugEnabled()) {
                     log.debug("No device is found upon the device identifier '" + deviceId.getId() +
@@ -129,8 +129,8 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
         }
         try {
             List<Integer> deviceIds = new ArrayList<>();
-            List<Device> devices = DeviceManagementDataHolder.getInstance().
+            List<Device> devices = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
-                    getDeviceManagementProvider().getAllDevices();
+                    getAllDevices(false);
             for (Device device : devices) {
                 if (identifierMap.containsKey(device.getDeviceIdentifier()) &&
                         device.getType().equals(identifierMap.get(device.getDeviceIdentifier()).getType())) {
@@ -160,7 +160,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
 
         try {
             Device device = DeviceManagementDataHolder.getInstance().
-                    getDeviceManagementProvider().getDevice(deviceLocation.getDeviceIdentifier());
+                    getDeviceManagementProvider().getDevice(deviceLocation.getDeviceIdentifier(), false);
             deviceLocation.setDeviceId(device.getId());
             DeviceManagementDAOFactory.beginTransaction();
             deviceDAO.updateDevice(device, CarbonContext.getThreadLocalCarbonContext().getTenantId());
@@ -203,7 +203,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
     public DeviceLocation getDeviceLocation(DeviceIdentifier deviceId) throws DeviceDetailsMgtException {
         Device device;
         try {
-            device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceId);
+            device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceId, false);
             if (device == null) {
                 if (log.isDebugEnabled()) {
                     log.debug("No device is found upon the device identifier '" + deviceId.getId() +
@@ -232,7 +232,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
 
         try {
             List<Device> devices = DeviceManagementDataHolder.getInstance().
-                    getDeviceManagementProvider().getAllDevices(deviceIdentifiers.get(0).getType());
+                    getDeviceManagementProvider().getAllDevices(deviceIdentifiers.get(0).getType(), false);
             List<DeviceLocation> deviceLocations = new ArrayList<>();
             DeviceManagementDAOFactory.openConnection();
             for (Device device : devices) {

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

@@ -54,6 +54,18 @@ public interface DeviceManagementProviderService {
      */
     List<Device> getAllDevices(String deviceType) throws DeviceManagementException;
 
+    /**
+     * Method to retrieve all the devices of a given device type.
+     *
+     * @param deviceType Device-type of the required devices
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices of given device-type.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   devices.
+     */
+    List<Device> getAllDevices(String deviceType, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to retrieve all the devices registered in the system.
      *
@@ -63,6 +75,38 @@ public interface DeviceManagementProviderService {
      */
     List<Device> getAllDevices() throws DeviceManagementException;
 
+    /**
+     * Method to retrieve all the devices registered in the system.
+     *
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of registered devices.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   devices.
+     */
+    List<Device> getAllDevices(boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * Method to retrieve all the devices registered in the system.
+     *
+     * @param since - Date value where the resource was last modified
+     * @return List of registered devices.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   devices.
+     */
+    List<Device> getDevices(Date since) throws DeviceManagementException;
+
+    /**
+     * Method to retrieve all the devices registered in the system.
+     *
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of registered devices.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   devices.
+     */
+    List<Device> getDevices(Date since, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to retrieve all the devices with pagination support.
      *
@@ -73,6 +117,18 @@ public interface DeviceManagementProviderService {
      */
     PaginationResult getDevicesByType(PaginationRequest request) throws DeviceManagementException;
 
+    /**
+     * Method to retrieve all the devices with pagination support.
+     *
+     * @param request PaginationRequest object holding the data for pagination
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return PaginationResult - Result including the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   devices.
+     */
+    PaginationResult getDevicesByType(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to retrieve all the devices with pagination support.
      *
@@ -83,21 +139,91 @@ public interface DeviceManagementProviderService {
      */
     PaginationResult getAllDevices(PaginationRequest request) throws DeviceManagementException;
 
-    void sendEnrolmentInvitation(String templateName, EmailMetaInfo metaInfo) throws DeviceManagementException;
+    /**
-
+     * Method to retrieve all the devices with pagination support.
-    void sendRegistrationEmail(EmailMetaInfo metaInfo) throws DeviceManagementException;
+     *
-
+     * @param request PaginationRequest object holding the data for pagination
-    FeatureManager getFeatureManager(String deviceType) throws DeviceManagementException;
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return PaginationResult - Result including the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   devices.
+     */
+    PaginationResult getAllDevices(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
 
     /**
-     * Proxy method to get the tenant configuration of a given platform.
+     * Returns the device of specified id.
      *
-     * @param deviceType Device platform
+     * @param deviceId device Id
-     * @return Tenant configuration settings of the particular tenant and platform.
+     * @return Device returns null when device is not available.
-     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     * @throws DeviceManagementException
-     *                                   configuration.
      */
-    PlatformConfiguration getConfiguration(String deviceType) throws DeviceManagementException;
+    Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException;
+
+    /**
+     * Returns the device of specified id.
+     *
+     * @param deviceId device Id
+     * @return Device returns null when device is not available.
+     * @throws DeviceManagementException
+     */
+    Device getDeviceWithTypeProperties(DeviceIdentifier deviceId) throws DeviceManagementException;
+
+    /**
+     * Returns the device of specified id.
+     *
+     * @param deviceId device Id
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return Device returns null when device is not available.
+     * @throws DeviceManagementException
+     */
+    Device getDevice(DeviceIdentifier deviceId, boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * Returns the device of specified id.
+     *
+     * @param deviceId device Id
+     * @param since - Date value where the resource was last modified
+     * @return Device returns null when device is not available.
+     * @throws DeviceManagementException
+     */
+    Device getDevice(DeviceIdentifier deviceId, Date since) throws DeviceManagementException;
+
+    /**
+     * Returns the device of specified id.
+     *
+     * @param deviceId device Id
+     * @param since - Date value where the resource was last modified
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return Device returns null when device is not available.
+     * @throws DeviceManagementException
+     */
+    Device getDevice(DeviceIdentifier deviceId, Date since, boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * Returns the device of specified id with the given status.
+     *
+     * @param deviceId device Id
+     * @param status - Status of the device
+     *
+     * @return Device returns null when device is not available.
+     * @throws DeviceManagementException
+     */
+    Device getDevice(DeviceIdentifier deviceId, EnrolmentInfo.Status status) throws DeviceManagementException;
+
+    /**
+     * Returns the device of specified id with the given status.
+     *
+     * @param deviceId device Id
+     * @param status - Status of the device
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return Device returns null when device is not available.
+     * @throws DeviceManagementException
+     */
+    Device getDevice(DeviceIdentifier deviceId, EnrolmentInfo.Status status, boolean requireDeviceInfo) throws DeviceManagementException;
 
     /**
      * Method to get the list of devices owned by an user with paging information.
@@ -109,6 +235,18 @@ public interface DeviceManagementProviderService {
      */
     PaginationResult getDevicesOfUser(PaginationRequest request) throws DeviceManagementException;
 
+    /**
+     * Method to get the list of devices owned by an user with paging information.
+     *
+     * @param request PaginationRequest object holding the data for pagination
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices owned by a particular user along with the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    PaginationResult getDevicesOfUser(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to get the list of devices filtered by the ownership with paging information.
      *
@@ -119,6 +257,18 @@ public interface DeviceManagementProviderService {
      */
     PaginationResult getDevicesByOwnership(PaginationRequest request) throws DeviceManagementException;
 
+    /**
+     * Method to get the list of devices filtered by the ownership with paging information.
+     *
+     * @param request PaginationRequest object holding the data for pagination
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices owned by a particular user along with the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    PaginationResult getDevicesByOwnership(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to get the list of devices owned by an user.
      *
@@ -129,16 +279,42 @@ public interface DeviceManagementProviderService {
      */
     List<Device> getDevicesOfUser(String userName) throws DeviceManagementException;
 
+    /**
+     * Method to get the list of devices owned by an user.
+     *
+     * @param userName Username of the user
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices owned by a particular user
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    List<Device> getDevicesOfUser(String userName, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * This method returns the list of device owned by a user of given device type.
      *
      * @param userName   user name.
      * @param deviceType device type name
-     * @return
+     * @return List of device owned by the given user and type.
-     * @throws DeviceManagementException
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
      */
     List<Device> getDevicesOfUser(String userName, String deviceType) throws DeviceManagementException;
 
+    /**
+     * This method returns the list of device owned by a user of given device type.
+     *
+     * @param userName   user name.
+     * @param deviceType device type name
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of device owned by the given user and type.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    List<Device> getDevicesOfUser(String userName, String deviceType, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to get the list of devices owned by users of a particular user-role.
      *
@@ -149,6 +325,94 @@ public interface DeviceManagementProviderService {
      */
     List<Device> getAllDevicesOfRole(String roleName) throws DeviceManagementException;
 
+    /**
+     * Method to get the list of devices owned by users of a particular user-role.
+     *
+     * @param roleName Role name of the users
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices owned by users of a particular role
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    List<Device> getAllDevicesOfRole(String roleName, boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices based on the device status with paging information.
+     *
+     * @param request PaginationRequest object holding the data for pagination and filter info
+     * @return List of devices in given status along with the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    PaginationResult getDevicesByStatus(PaginationRequest request) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices based on the device status with paging information.
+     *
+     * @param request PaginationRequest object holding the data for pagination and filter info
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices in given status along with the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    PaginationResult getDevicesByStatus(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * Method to get the list of devices that matches with the given device name.
+     *
+     * @param request PaginationRequest object holding the data for pagination and filter info
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices that matches with the given device name.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    List<Device> getDevicesByNameAndType(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices that matches with the given device name with paging information.
+     *
+     * @param request PaginationRequest object holding the data for pagination
+     * @return List of devices in given status along with the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    PaginationResult getDevicesByName(PaginationRequest request) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices that matches with the given device name with paging information.
+     *
+     * @param request PaginationRequest object holding the data for pagination
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices in given status along with the required parameters necessary to do pagination.
+     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+     *                                   device list
+     */
+    PaginationResult getDevicesByName(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices based on the device status.
+     *
+     * @param status Device status
+     * @return List of devices
+     * @throws DeviceManagementException
+     */
+    List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException;
+
+    /**
+     * This method is used to retrieve list of devices based on the device status.
+     *
+     * @param status Device status
+     * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required
+     *                          along with the device data.
+     * @return List of devices
+     * @throws DeviceManagementException
+     */
+    List<Device> getDevicesByStatus(EnrolmentInfo.Status status, boolean requireDeviceInfo) throws DeviceManagementException;
+
     /**
      * Method to get the device count of user.
      *
@@ -167,47 +431,26 @@ public interface DeviceManagementProviderService {
      */
     int getDeviceCount() throws DeviceManagementException;
 
-    /**
+    HashMap<Integer, Device> getTenantedDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException;
-     * Method to get the list of devices that matches with the given device name.
+
-     *
+    void sendEnrolmentInvitation(String templateName, EmailMetaInfo metaInfo) throws DeviceManagementException;
-     * @param deviceName name of the device
+
-     * @return List of devices that matches with the given device name.
+    void sendRegistrationEmail(EmailMetaInfo metaInfo) throws DeviceManagementException;
-     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
+
-     *                                   device list
+    FeatureManager getFeatureManager(String deviceType) throws DeviceManagementException;
-     */
-    List<Device> getDevicesByNameAndType(String deviceName, String type, int offset, int limit) throws DeviceManagementException;
 
     /**
-     * This method is used to retrieve list of devices that matches with the given device name with paging information.
+     * Proxy method to get the tenant configuration of a given platform.
      *
-     * @param request PaginationRequest object holding the data for pagination
+     * @param deviceType Device platform
-     * @return List of devices in given status along with the required parameters necessary to do pagination.
+     * @return Tenant configuration settings of the particular tenant and platform.
      * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
-     *                                   device list
+     *                                   configuration.
      */
-    PaginationResult getDevicesByName(PaginationRequest request) throws DeviceManagementException;
+    PlatformConfiguration getConfiguration(String deviceType) throws DeviceManagementException;
 
     void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status active) throws DeviceManagementException;
 
-    /**
-     * This method is used to retrieve list of devices based on the device status.
-     *
-     * @param status Device status
-     * @return List of devices
-     * @throws DeviceManagementException
-     */
-    List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException;
-
-    /**
-     * This method is used to retrieve list of devices based on the device status with paging information.
-     *
-     * @param request PaginationRequest object holding the data for pagination
-     * @return List of devices in given status along with the required parameters necessary to do pagination.
-     * @throws DeviceManagementException If some unusual behaviour is observed while fetching the
-     *                                   device list
-     */
-    PaginationResult getDevicesByStatus(PaginationRequest request) throws DeviceManagementException;
-
     /**
      * This method is used to check whether the device is enrolled with the give user.
      *
@@ -247,21 +490,6 @@ public interface DeviceManagementProviderService {
 
     boolean setActive(DeviceIdentifier deviceId, boolean status) throws DeviceManagementException;
 
-    /**
-     * Returns the device of specified id.
-     *
-     * @param deviceId device Id
-     * @return Device returns null when device is not avaialble.
-     * @throws DeviceManagementException
-     */
-    Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException;
-
-    Device getDevice(DeviceIdentifier deviceId, Date since) throws DeviceManagementException;
-
-    HashMap<Integer, Device> getTenantedDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException;
-
-    Device getDevice(DeviceIdentifier deviceId, EnrolmentInfo.Status status) throws DeviceManagementException;
-
     List<String> getAvailableDeviceTypes() throws DeviceManagementException;
 
     boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException;

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

@@ -472,7 +472,8 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             GroupManagementDAOFactory.beginTransaction();
             for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) {
-                device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceIdentifier);
+                device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
+                        getDevice(deviceIdentifier, false);
                 if (device == null) {
                     throw new DeviceNotFoundException("Device not found for id '" + deviceIdentifier.getId() + "'");
                 }
@@ -504,7 +505,8 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             GroupManagementDAOFactory.beginTransaction();
             for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) {
-                device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceIdentifier);
+                device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
+                        getDevice(deviceIdentifier, false);
                 if (device == null) {
                     throw new DeviceNotFoundException("Device not found for id '" + deviceIdentifier.getId() + "'");
                 }
@@ -553,7 +555,7 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     public List<DeviceGroup> getGroups(DeviceIdentifier deviceIdentifier) throws GroupManagementException {
         DeviceManagementProviderService managementProviderService = new DeviceManagementProviderServiceImpl();
         try {
-            Device device = managementProviderService.getDevice(deviceIdentifier);
+            Device device = managementProviderService.getDevice(deviceIdentifier, false);
             GroupManagementDAOFactory.openConnection();
             return groupDAO.getGroups(device.getId(),
                     PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());

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

@@ -90,7 +90,7 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
             List<String> operations;
 
             operations = this.getValidOperationNames(); //list operations for each device type
-            devices = deviceManagementProviderService.getAllDevices(deviceType);//list devices for each type
+            devices = deviceManagementProviderService.getAllDevices(deviceType, false);//list devices for each type
             if (!devices.isEmpty()) {
                 for (String str : operations) {
                     CommandOperation operation = new CommandOperation();

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

@@ -444,7 +444,8 @@ public final class DeviceManagerUtil {
     }
 
     public static boolean isValidDeviceIdentifier(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {
-        Device device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceIdentifier);
+        Device device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceIdentifier,
+                false);
         if (device == null || device.getDeviceIdentifier() == null ||
                 device.getDeviceIdentifier().isEmpty() || device.getEnrolmentInfo() == null) {
             return false;

components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -519,8 +519,8 @@
 {{/zone}}
 
 {{#zone "bottomJs"}}
-    <script id="device-listing" data-analitics-url="{{analyticsURL}}" data-current-user="{{@user.username}}" data-device-types="{{deviceTypes}}"
+    <script id="device-listing" data-server-url="{{serverUrl}}" data-current-user="{{@user.username}}" data-device-types="{{deviceTypes}}"
-            type="text/x-handlebars-template"></script>
+            data-portal-url="{{portalUrl}}" data-user-domain="{{userDomain}}" 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

@@ -60,6 +60,8 @@ function onRequest(context) {
                 if (data) {
                     for (var i = 0; i < data.length; i++) {
                         var config = utility.getDeviceTypeConfig(data[i]);
+                        var log = new Log("devices.js");
+
                         if (!config) {
                             continue;
                         }
@@ -70,7 +72,8 @@ function onRequest(context) {
                                              "label": deviceType.label,
                                              "thumb": utility.getDeviceThumb(data[i]),
                                              "analyticsEnabled": deviceType.analyticsEnabled,
-                                             "groupingEnabled": deviceType.groupingEnabled
+                                             "groupingEnabled": deviceType.groupingEnabled,
+                                             "analyticsView" : deviceType.analyticsView
                                          });
                     }
                 }
@@ -80,9 +83,11 @@ function onRequest(context) {
     }
 
     var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
-    var analyticsServer = mdmProps["dashboardServerURL"];
+    var serverUrl = mdmProps["httpsURL"];
-    var analyticsURL =  analyticsServer + "/portal/t/" + context.user.userDomain + "/dashboards/android-iot/battery?owner=" + context.user.username + "&deviceId=";
+    var portalUrl = mdmProps["portalURL"];
-    viewModel.analyticsURL = analyticsURL;
+    var userDomain = context.user.domain;
-
+    viewModel.serverUrl = serverUrl;
+    viewModel.portalUrl = portalUrl;
+    viewModel.userDomain = userDomain;
     return viewModel;
 }

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

@@ -224,6 +224,22 @@ function loadDevices(searchType, searchParam) {
         return true;
     }
 
+    // Read "analyticsView" from config.json and return value if exists
+    function getAnalyticsView(type) {
+        var deviceTypes = deviceListing.data("deviceTypes");
+        for (var i = 0; i < deviceTypes.length; i++) {
+            if (deviceTypes[i].type == type) {
+                var analyticsView = deviceTypes[i].analyticsView;
+                if (analyticsEnabled == undefined) {
+                    // if undefined go to default analytics view
+                    return "none";
+                }
+                return analyticsView;
+            }
+        }
+        return "none";
+    }
+
     function groupingEnabled(type) {
         var deviceTypes = deviceListing.data("deviceTypes");
         for (var i = 0; i < deviceTypes.length; i++) {
@@ -323,12 +339,20 @@ function loadDevices(searchType, searchParam) {
                 var deviceType = row.deviceType;
                 var deviceIdentifier = row.deviceIdentifier;
                 var html = '<span></span>';
-                var statURL = $("#device-listing").data("analitics-url");
+                var portalUrl = $("#device-listing").data("portal-url");
+                var serverUrl = $("#device-listing").data("server-url");
+                var userDomain = $("#device-listing").data("userDomain");
+                var statURL;
                 if (status != 'REMOVED') {
                     html = '';
 
                     if (analyticsEnabled(row.deviceType)) {
 
+                        // redirecting to respective analytics view depending on device configs
+                        switch (getAnalyticsView(deviceType)) {
+                            case "DAS" : { statURL =portalUrl + "/portal/t/"+ userDomain+ "/dashboards/android-iot/battery?owner=" +currentUser+"&deviceId=";break;}
+                            default : {statURL=context+ "/device/" + row.deviceType +"/analytics?deviceId="}
+                        }
 
                         html += '<a href="' + statURL  +
                             deviceIdentifier + '&deviceName=' + row.name + '" ' + 'data-click-event="remove-form"' +

components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/email-sender/org.wso2.carbon.email.sender.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/email-sender/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client registration service</name>
     <description>WSO2 Carbon - Dynamic Client Registration Service</description>

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.web.app.registration</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client web app registration</name>
     <description>WSO2 Carbon - Dynamic Client Web-app Registration Service</description>

components/identity-extensions/dynamic-client-registration/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic client registration</name>
     <url>http://wso2.org</url>

components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml

@@ -22,18 +22,22 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - OAuth Extensions</name>
     <url>http://wso2.org</url>
 
     <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.identity.authenticator.backend.oauth</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>commons-codec.wso2</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -87,13 +91,18 @@
                             org.wso2.carbon.device.mgt.oauth.extensions.*
                         </Export-Package>
                         <Import-Package>
+                            org.wso2.carbon.identity.authenticator.backend.oauth.*,
 							org.wso2.carbon.identity.oauth2.grant.jwt;version="${carbon.identity.jwt.grant.version.range}",
+                            org.apache.commons.lang,
                             org.apache.commons.logging,
                             org.osgi.service.component,
                             org.wso2.carbon.identity.application.common.model;version="${carbon.identity.framework.version.range}",
+                            org.wso2.carbon.identity.application.common;version="${carbon.identity.framework.version.range}",
+                            org.wso2.carbon.identity.application.mgt.*;version="${carbon.identity.framework.version.range}",
                             org.wso2.carbon.user.api,
                             org.wso2.carbon.user.core.service,
                             org.wso2.carbon.user.core.tenant,
+                            org.wso2.carbon.user.core.util,
                             org.json.simple,
                             javax.cache,
                             org.wso2.carbon.identity.core.util;version="${carbon.identity.framework.version.range}",
@@ -105,7 +114,8 @@
 							org.wso2.carbon.identity.application.authentication.framework.model;version="${carbon.identity.framework.version.range}",
 							org.wso2.carbon.identity.base;version="${carbon.identity.framework.version.range}",
 							org.wso2.carbon.identity.oauth2.*;version="${carbon.identity.framework.version.range}",
-							org.wso2.carbon.utils.multitenancy
+							org.wso2.carbon.utils.multitenancy,
+                            org.apache.oltu.oauth2.common.validators
                         </Import-Package>
                     </instructions>
                 </configuration>

components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2017, 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.oauth.extensions.handlers.grant;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.keymgt.ScopesIssuer;
+import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
+import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
+import org.wso2.carbon.identity.application.common.model.ServiceProvider;
+import org.wso2.carbon.identity.authenticator.backend.oauth.validator.OAuth2TokenValidator;
+import org.wso2.carbon.identity.authenticator.backend.oauth.validator.OAuthValidationResponse;
+import org.wso2.carbon.identity.authenticator.backend.oauth.validator.OAuthValidatorFactory;
+import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
+import org.wso2.carbon.identity.oauth2.dto.OAuth2AccessTokenReqDTO;
+import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder;
+import org.wso2.carbon.identity.oauth2.model.RequestParameter;
+import org.wso2.carbon.identity.oauth2.token.OAuthTokenReqMessageContext;
+import org.wso2.carbon.identity.oauth2.token.handlers.grant.AbstractAuthorizationGrantHandler;
+import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
+import org.wso2.carbon.user.core.util.UserCoreUtil;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+import java.rmi.RemoteException;
+
+/**
+ * This allows user to generate a new access token using an existing access token.
+ */
+@SuppressWarnings("unused")
+public class AccessTokenGrantHandler extends AbstractAuthorizationGrantHandler {
+    private static Log log = LogFactory.getLog(AccessTokenGrantHandler.class);
+    private static final String TENANT_DOMAIN_KEY = "tenantDomain";
+
+    private OAuth2TokenValidator tokenValidator;
+    public static final String TOKEN_GRANT_PARAM = "admin_access_token";
+
+    public AccessTokenGrantHandler() {
+        try {
+            tokenValidator = OAuthValidatorFactory.getValidator();
+        } catch (IllegalArgumentException e) {
+            log.error("Failed to initialise Authenticator", e);
+        }
+    }
+
+    @Override
+    public boolean validateScope(OAuthTokenReqMessageContext tokReqMsgCtx) {
+        return ScopesIssuer.getInstance().setScopes(tokReqMsgCtx);
+    }
+
+    @Override
+    public boolean validateGrant(OAuthTokenReqMessageContext tokReqMsgCtx) throws IdentityOAuth2Exception {
+        if (!super.validateGrant(tokReqMsgCtx)) {
+            return false;
+        } else {
+            OAuth2AccessTokenReqDTO oAuth2AccessTokenReqDTO = tokReqMsgCtx.getOauth2AccessTokenReqDTO();
+            String username = null;
+            String userTenantDomain = null;
+            String clientId = oAuth2AccessTokenReqDTO.getClientId();
+            String spTenantDomain = null;
+            OAuthValidationResponse response;
+            ServiceProvider serviceProvider;
+            boolean authStatus = false;
+
+            String accessToken = null;
+            RequestParameter[] parameters = tokReqMsgCtx.getOauth2AccessTokenReqDTO().getRequestParameters();
+
+            for (RequestParameter parameter : parameters) {
+                if (TOKEN_GRANT_PARAM.equals(parameter.getKey())) {
+                    if (parameter.getValue() != null && parameter.getValue().length > 0) {
+                        accessToken = parameter.getValue()[0];
+                    }
+                }
+            }
+
+            if (accessToken != null && !accessToken.isEmpty()) {
+                try {
+                    response = tokenValidator.validateToken(accessToken);
+                } catch (RemoteException e) {
+                    log.error("Failed to validate the OAuth token provided.", e);
+                    return false;
+                }
+                if (response != null && response.isValid()) {
+                    authStatus = true;
+                    username = response.getUserName();
+                    userTenantDomain = MultitenantUtils.getTenantDomain(username);
+                    spTenantDomain = response.getTenantDomain();
+                }
+            }
+
+            try {
+                serviceProvider = OAuth2ServiceComponentHolder.getApplicationMgtService()
+                        .getServiceProviderByClientId(clientId, "oauth2", spTenantDomain);
+            } catch (IdentityApplicationManagementException var15) {
+                throw new IdentityOAuth2Exception("Error occurred while retrieving OAuth2 application data for client id "
+                        + clientId, var15);
+            }
+
+            if (!serviceProvider.isSaasApp() && !userTenantDomain.equals(spTenantDomain)) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Non-SaaS service provider tenant domain is not same as user tenant domain; "
+                            + spTenantDomain + " != " + userTenantDomain);
+                }
+
+                return false;
+            } else {
+                String tenantAwareUserName = MultitenantUtils.getTenantAwareUsername(username);
+                username = tenantAwareUserName + "@" + userTenantDomain;
+                if (authStatus) {
+                    if (!username.contains("/") && StringUtils.isNotBlank(UserCoreUtil.getDomainFromThreadLocal())) {
+                        username = UserCoreUtil.getDomainFromThreadLocal() + "/" + username;
+                    }
+
+                    AuthenticatedUser user = OAuth2Util.getUserFromUserName(username);
+                    user.setAuthenticatedSubjectIdentifier(user.toString());
+                    tokReqMsgCtx.setAuthorizedUser(user);
+                    tokReqMsgCtx.setScope(oAuth2AccessTokenReqDTO.getScope());
+                    return authStatus;
+                } else {
+                    throw new IdentityOAuth2Exception("Authentication failed for " + username);
+                }
+            }
+        }
+    }
+}

components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017, 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.oauth.extensions.validators;
+
+import org.apache.oltu.oauth2.common.validators.AbstractValidator;
+import org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler;
+
+import javax.servlet.http.HttpServletRequest;
+
+@SuppressWarnings("unused")
+public class AccessTokenGrantValidator extends AbstractValidator<HttpServletRequest> {
+
+    public AccessTokenGrantValidator() {
+        requiredParams.add(AccessTokenGrantHandler.TOKEN_GRANT_PARAM);
+    }
+
+}

components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,10 +34,10 @@
     <url>http://wso2.org</url>
 
     <modules>
+        <module>org.wso2.carbon.identity.authenticator.backend.oauth</module>
         <module>org.wso2.carbon.device.mgt.oauth.extensions</module>
         <module>org.wso2.carbon.identity.jwt.client.extension</module>
         <module>dynamic-client-registration</module>
-        <module>org.wso2.carbon.identity.authenticator.backend.oauth</module>
     </modules>
 
 </project>

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.complex.policy.decision.point</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml

@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.information.point</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Information Point</name>
     <description>WSO2 Carbon - Policy Information Point</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Common</name>
     <description>WSO2 Carbon - Policy Management Common</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/DelegationTask.java

@@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.ntask.core.Task;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
@@ -64,15 +63,15 @@ public class DelegationTask implements Task {
                 log.debug("Number of device types which policies are changed .......... : " + deviceTypes.size());
             }
             if (!deviceTypes.isEmpty()) {
-                DeviceManagementProviderService service = PolicyManagementDataHolder.getInstance()
+                DeviceManagementProviderService service = PolicyManagementDataHolder.getInstance().
-                        .getDeviceManagementService();
+                        getDeviceManagementService();
                 List<Device> devices;
                 List<Device> toBeNotified;
                 for (String deviceType : deviceTypes) {
                     try {
                         devices = new ArrayList<>();
                         toBeNotified = new ArrayList<>();
-                        devices.addAll(service.getAllDevices(deviceType));
+                        devices.addAll(service.getAllDevices(deviceType, false));
                         //HashMap<Integer, Integer> deviceIdPolicy = policyManager.getAppliedPolicyIdsDeviceIds();
                         for (Device device : devices) {
                             // if (deviceIdPolicy.containsKey(device.getId())) {

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

@@ -54,7 +54,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
         try {
             DeviceManagementProviderService service = this.getDeviceManagementProviderService();
             for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) {
-                Device device = service.getDevice(deviceIdentifier);
+                Device device = service.getDevice(deviceIdentifier, false);
                 service.setStatus(deviceIdentifier, device.getEnrolmentInfo().getOwner(),
                         EnrolmentInfo.Status.UNREACHABLE);
             }
@@ -71,7 +71,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
         try {
             DeviceManagementProviderService service = this.getDeviceManagementProviderService();
             for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) {
-                Device device = service.getDevice(deviceIdentifier);
+                Device device = service.getDevice(deviceIdentifier, false);
                 service.setStatus(deviceIdentifier, device.getEnrolmentInfo().getOwner(),
                                   EnrolmentInfo.Status.INACTIVE);
             }
@@ -106,7 +106,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
         try {
 
             DeviceManagementProviderService service = this.getDeviceManagementProviderService();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             service.setStatus(deviceIdentifier, device.getEnrolmentInfo().getOwner(),
                     EnrolmentInfo.Status.ACTIVE);
 
@@ -213,7 +213,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
 
         try {
             DeviceManagementProviderService service = this.getDeviceManagementProviderService();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             service.setStatus(deviceIdentifier, device.getEnrolmentInfo().getOwner(),
                     EnrolmentInfo.Status.ACTIVE);
 
@@ -231,7 +231,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
         try {
 
             DeviceManagementProviderService service = this.getDeviceManagementProviderService();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             service.setStatus(deviceIdentifier, device.getEnrolmentInfo().getOwner(),
                     EnrolmentInfo.Status.INACTIVE);
 
@@ -248,7 +248,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
 
         try {
             DeviceManagementProviderService service = this.getDeviceManagementProviderService();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             service.setStatus(deviceIdentifier, device.getEnrolmentInfo().getOwner(),
                     EnrolmentInfo.Status.ACTIVE);
 

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

@@ -79,7 +79,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
             DeviceManagementProviderService service =
                     PolicyManagementDataHolder.getInstance().getDeviceManagementService();
             PolicyManager manager = PolicyManagementDataHolder.getInstance().getPolicyManager();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             Policy policy = manager.getAppliedPolicyToDevice(deviceIdentifier);
             if (policy != null) {
                 PolicyMonitoringManager monitoringService = PolicyManagementDataHolder.getInstance().
@@ -177,7 +177,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
         try {
             DeviceManagementProviderService service =
                     PolicyManagementDataHolder.getInstance().getDeviceManagementService();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             PolicyManagementDAOFactory.openConnection();
             NonComplianceData complianceData = monitoringDAO.getCompliance(device.getId(), device.getEnrolmentInfo()
                                                                                               .getId());
@@ -207,7 +207,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
             PolicyManagementDAOFactory.openConnection();
             DeviceManagementProviderService service =
                     PolicyManagementDataHolder.getInstance().getDeviceManagementService();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             complianceData = monitoringDAO.getCompliance(device.getId(), device.getEnrolmentInfo().getId());
             List<ComplianceFeature> complianceFeatures =
                     monitoringDAO.getNoneComplianceFeatures(complianceData.getId());

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

@@ -392,7 +392,7 @@ public class PolicyManagerImpl implements PolicyManager {
         DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
         for (DeviceIdentifier deviceIdentifier : deviceIdentifierList) {
             try {
-                Device device = service.getDevice(deviceIdentifier);
+                Device device = service.getDevice(deviceIdentifier, false);
                 deviceList.add(device);
             } catch (DeviceManagementException e) {
                 throw new PolicyManagementException("Error occurred while retrieving device information", e);
@@ -641,7 +641,7 @@ public class PolicyManagerImpl implements PolicyManager {
         try {
 
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
 
             PolicyManagementDAOFactory.openConnection();
             policyIdList = policyDAO.getPolicyIdsOfDevice(device);
@@ -807,7 +807,7 @@ public class PolicyManagerImpl implements PolicyManager {
         int deviceId = -1;
         try {
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             deviceId = device.getId();
 
             PolicyManagementDAOFactory.beginTransaction();
@@ -879,7 +879,7 @@ public class PolicyManagerImpl implements PolicyManager {
         int deviceId = -1;
         try {
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             deviceId = device.getId();
             PolicyManagementDAOFactory.beginTransaction();
 
@@ -909,7 +909,7 @@ public class PolicyManagerImpl implements PolicyManager {
         int deviceId = -1;
         try {
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             deviceId = device.getId();
             PolicyManagementDAOFactory.beginTransaction();
 
@@ -937,7 +937,7 @@ public class PolicyManagerImpl implements PolicyManager {
         boolean exist;
         try {
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
             PolicyManagementDAOFactory.openConnection();
             exist = policyDAO.checkPolicyAvailable(device.getId(), device.getEnrolmentInfo().getId());
         } catch (PolicyManagerDAOException e) {
@@ -958,7 +958,7 @@ public class PolicyManagerImpl implements PolicyManager {
     public boolean setPolicyApplied(DeviceIdentifier deviceIdentifier) throws PolicyManagementException {
         try {
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-            Device device = service.getDevice(deviceIdentifier);
+            Device device = service.getDevice(deviceIdentifier, false);
 
             PolicyManagementDAOFactory.openConnection();
             policyDAO.setPolicyApplied(device.getId(), device.getEnrolmentInfo().getId());
@@ -996,7 +996,7 @@ public class PolicyManagerImpl implements PolicyManager {
         DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
         Device device;
         try {
-            device = service.getDevice(deviceId);
+            device = service.getDevice(deviceId, false);
             if (device == null) {
                 if (log.isDebugEnabled()) {
                     log.debug("No device is found upon the device identifier '" + deviceId.getId() +

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

@@ -24,11 +24,9 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.ntask.core.Task;
-import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
 
@@ -83,7 +81,7 @@ public class MonitoringTask implements Task {
                     PolicyMonitoringManager monitoringService =
                             PolicyManagementDataHolder.getInstance().getDeviceManagementService()
                                     .getPolicyMonitoringManager(deviceType);
-                    List<Device> devices = deviceManagementProviderService.getAllDevices(deviceType);
+                    List<Device> devices = deviceManagementProviderService.getAllDevices(deviceType, false);
                     if (monitoringService != null && !devices.isEmpty()) {
                         List<Device> notifiableDevices = new ArrayList<>();
                         if (log.isDebugEnabled()) {

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/MonitoringTestCase.java

@@ -140,7 +140,7 @@ public class MonitoringTestCase extends BasePolicyManagementDAOTest {
         MonitoringManager monitoringManager = new MonitoringManagerImpl();
 
         DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-        List<Device> devices = service.getAllDevices(ANDROID);
+        List<Device> devices = service.getAllDevices(ANDROID, false);
 
         // monitoringManager.addMonitoringOperation(devices);
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyDAOTestCase.java

@@ -118,7 +118,7 @@ public class PolicyDAOTestCase extends BasePolicyManagementDAOTest {
         if (log.isDebugEnabled()) {
             log.debug("Printing device taken by calling the service layer with device type.");
         }
-        List<Device> devices3 = service.getAllDevices("android");
+        List<Device> devices3 = service.getAllDevices("android", false);
 
         log.debug("Device list size ...! " + devices3.size());
         for (Device device : devices3) {
@@ -437,7 +437,7 @@ public class PolicyDAOTestCase extends BasePolicyManagementDAOTest {
         PolicyManagerService policyManagerService = new PolicyManagerServiceImpl();
 
         List<Policy> policies = policyManagerService.getPolicies("android");
-        List<Device> devices = service.getAllDevices("android");
+        List<Device> devices = service.getAllDevices("android", false);
 
         for (Policy policy : policies) {
             log.debug("Policy Name : " + policy.getPolicyName());

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyEvaluationTestCase.java

@@ -95,7 +95,7 @@ public class PolicyEvaluationTestCase extends BasePolicyManagementDAOTest {
         log.debug("Getting effective policy for device started ..........");
 
         DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
-        List<Device> devices = service.getAllDevices(ANDROID);
+        List<Device> devices = service.getAllDevices(ANDROID, false);
 
         PolicyEvaluationPoint evaluationPoint = PolicyManagementDataHolder.getInstance().getPolicyEvaluationPoint();
 

components/policy-mgt/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Component</name>
     <url>http://wso2.org</url>

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>webapp-authenticator-framework</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.webapp.authenticator.framework</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Web Application Authenticator Framework Bundle</name>
     <description>WSO2 Carbon - Web Application Authenticator Framework Bundle</description>

components/webapp-authenticator-framework/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Webapp Authenticator Framework</name>
     <url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.application.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Application Extension Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a api application registration, which takes care of subscription

features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handler.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - APIM handler Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the handler for the api authentications

features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/src/main/resources/conf/iot-api-config.xml

@@ -19,20 +19,20 @@
 
 <ServerConfiguration>
     <!-- IoT server host name, this is referred from APIM gateway to call to IoT server for certificate validation-->
-    <Hostname>https://localhost:9443/</Hostname>
+    <Hostname>https://${iot.core.host}:${iot.core.https.port}/</Hostname>
 
     <!--End point to verify the certificate-->
-    <VerificationEndpoint>https://localhost:9443/api/certificate-mgt/v1.0/admin/certificates/verify/</VerificationEndpoint>
+    <VerificationEndpoint>https://${iot.core.host}:${iot.core.https.port}/api/certificate-mgt/v1.0/admin/certificates/verify/</VerificationEndpoint>
 
     <!--Admin username/password - this is to use for oauth token generation-->
     <Username>admin</Username>
     <Password>admin</Password>
 
     <!--Dynamic client registration endpoint-->
-    <DynamicClientRegistrationEndpoint>https://localhost:9443/dynamic-client-web/register</DynamicClientRegistrationEndpoint>
+    <DynamicClientRegistrationEndpoint>https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</DynamicClientRegistrationEndpoint>
 
     <!--Oauth token endpoint-->
-    <OauthTokenEndpoint>https://localhost:9443/oauth2/token</OauthTokenEndpoint>
+    <OauthTokenEndpoint>https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token</OauthTokenEndpoint>
 
     <APIS>
         <ContextPath>/services</ContextPath>

features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml

@@ -21,13 +21,13 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
 		<artifactId>apimgt-extensions-feature</artifactId>
-		<version>2.0.72-SNAPSHOT</version>
+		<version>2.0.75-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client.feature</artifactId>
-	<version>2.0.72-SNAPSHOT</version>
+	<version>2.0.75-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>WSO2 Carbon - APIM Integration Client Feature</name>
 	<url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Webapp Publisher Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing

features/apimgt-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Feature</name>
     <url>http://wso2.org</url>

features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Certificate Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for back-end Certificate Management functionality

features/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt-feature</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Feature</name>
     <url>http://wso2.org</url>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Type Deployer Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - Device Type Deployer Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - FCM Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - XMPP Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - XMPP Based Push Notification Provider Feature</description>

features/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.device.mgt.analytics.dashboard.feature</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Dashboard Analytics Feature</name>
     <description>WSO2 Carbon - Device Management Dashboard Analytics Feature</description>

features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains bundles related to device analytics data publisher</description>

features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains common extensions used by key device management functionalities

features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>dynamic-client-registration-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Dynamic Client Registration Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains dynamic client registration features</description>

features/dynamic-client-registration/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration-feature</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.email.sender.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for email sender related functionality

features/email-sender/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>email-sender-feature</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>

features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>jwt-client-feature</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.jwt.client.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <name>WSO2 Carbon - JWT Client Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains jwt client implementation from which we can get a access token using the jwt

features/jwt-client/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.72-SNAPSHOT</version>
+        <version>2.0.75-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-client-feature</artifactId>
-    <version>2.0.72-SNAPSHOT</version>
+    <version>2.0.75-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>