few changes after test

modules/distribution/src/repository/conf/datasources/cdm-datasources.xml

@@ -16,7 +16,7 @@
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
-                    <defaultAutoCommit>true</defaultAutoCommit>
+                    <defaultAutoCommit>false</defaultAutoCommit>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <testOnBorrow>true</testOnBorrow>

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");

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 () {

modules/p2-profile-gen/pom.xml

@@ -181,6 +181,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ntask.core.feature:${carbon.commons.version}
+                                </featureArtifactDef>
                                 <!-- End of Carbon Commons Features -->
 
                                 <!-- Carbon Multi-tenancy Features -->
@@ -423,6 +426,10 @@
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <!-- End of Carbon Commons Features -->
 
                                 <!-- Carbon Multi-tenancy Features -->