diff --git a/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml b/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
index 646f9df4..78e29166 100755
--- a/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
@@ -16,7 +16,7 @@
wso2carbon
wso2carbon
org.h2.Driver
- true
+ false
50
60000
true
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
index 2b5e8184..62eeb49b 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
@@ -42,7 +42,7 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
log.debug("User Logged In : " + user);
}
- var hasDevcies = (deviceManagementService.getDeviceListOfUser(username).size() >= 1);
+ var hasDevcies = (deviceManagementService.getDevicesOfUser(username).size() >= 1);
if(hasDevcies){
response.sendRedirect(constants.WEB_APP_CONTEXT+"/devices");
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
index 1bff6d8e..db2d6110 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
@@ -28,7 +28,7 @@ utility = function () {
var publicMethods = {};
publicMethods.getDeviceManagementService = function () {
- return getOsgiService('org.wso2.carbon.device.mgt.core.service.DeviceManagementService');
+ return getOsgiService('org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService');
};
publicMethods.getUserManagementService = function () {
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index dec9c823..7349e3dc 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -181,6 +181,9 @@
org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}
+
+ org.wso2.carbon.commons:org.wso2.carbon.ntask.core.feature:${carbon.commons.version}
+
@@ -423,6 +426,10 @@
org.wso2.carbon.user.mgt.feature.group
${carbon.commons.version}
+
+ org.wso2.carbon.ntask.core.feature.group
+ ${carbon.commons.version}
+