From 47a06249bffda56aea31c68d7daf35fa96f5a1c2 Mon Sep 17 00:00:00 2001
From: Rasika Perera <rasikaperera@Rasikas-MacBook-Pro.local>
Date: Thu, 23 Jul 2015 13:00:59 +0530
Subject: [PATCH 1/2] fix changes for usermanager osgi service retrieve

---
 .../src/repository/jaggeryapps/iotserver/api/user-api.jag       | 1 +
 .../src/repository/jaggeryapps/iotserver/modules/utility.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 62eeb49b..7a16d385 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
@@ -26,6 +26,7 @@ var constants = require("/modules/constants.js");
 var dcProps = require('/config/dc-props.js').config();
 var userModule = require("/modules/user.js").userModule;
 var deviceModule = require("/modules/device.js").deviceModule;
+var utility = require("/modules/utility.js").utility;
 var deviceManagementService = utility.getDeviceManagementService();
 
 var result;
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
index db2d6110..3f5616f6 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
@@ -32,7 +32,7 @@ utility = function () {
     };
 
     publicMethods.getUserManagementService = function () {
-        return getOsgiService('org.wso2.carbon.device.mgt.user.core.UserManager');
+        return getOsgiService('org.wso2.carbon.user.api.UserRealmService');
     };
 
     publicMethods.getPolicyManagementService = function () {

From e055e79ea4d717c01e625a6b16329497e3a82957 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 23 Jul 2015 15:13:55 +0530
Subject: [PATCH 2/2] api publisher config removed

---
 modules/distribution/src/assembly/bin.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 93cab373..952ab49f 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -572,16 +572,6 @@
             <fileMode>644</fileMode>
         </file>
 
-	<!--API publisher config file-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/user-api-publisher-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-
         <!--License Config file-->
 	    <file>
             <source>