From 5b5df161fc02f6673fa41c98ba71ed2f03f53222 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Wed, 22 Jul 2015 11:10:33 +0530
Subject: [PATCH] few changes after test

---
 .../src/repository/conf/datasources/cdm-datasources.xml    | 2 +-
 .../src/repository/jaggeryapps/iotserver/api/user-api.jag  | 2 +-
 .../repository/jaggeryapps/iotserver/modules/utility.js    | 2 +-
 modules/p2-profile-gen/pom.xml                             | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

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 @@
                     <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>
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 @@
                                 <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 -->