Merge remote-tracking branch 'upstream/master'

modules/distribution/pom.xml

@@ -411,8 +411,6 @@
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches" />
 
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/dropins" />
-
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
                                     <fileset dir="src/repository/jaggeryapps"></fileset>
                                 </copy>
@@ -433,10 +431,6 @@
                                     <fileset dir="src/patches" />
                                 </copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/dropins">
-                                    <fileset dir="src/dropins" />
-                                </copy>
-
                                 <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>

modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag

@@ -78,7 +78,9 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
 	} else {
 		userRoles = String(addUserFormData.userRoles).split(",");
 	}
-	userRoles="deviceRole, deviceUser";
+	userRoles=["deviceRole, deviceUser"];
+	//TODO-Apply new users,
+	userRoles = [];
 	try {
 		result = userModule.registerUser(username, firstname, lastname, emailAddress, password,
 				userRoles);

modules/distribution/src/repository/jaggeryapps/iotserver/modules/user.js

@@ -23,8 +23,6 @@ userModule = function () {
     var constants = require("/modules/constants.js");
     var utility = require("/modules/utility.js").utility;
 
-    var userManagementService = utility.getUserManagementService();
-
     var publicMethods = {};
     var privateMethods = {};
 
@@ -252,8 +250,8 @@ userModule = function () {
             log.error("User object was not found in the session");
             throw constants.ERRORS.USER_NOT_FOUND;
         }
-
+        var userManager = new carbon.user.UserManager(server, tenantId);
-        var userList = userManagementService.getUsersForTenant(carbonUser.tenantId);
+        var userList = userManager.listUsers();
 
         var i, userObject;
         for (i = 0; i < userList.size(); i++) {

modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js

@@ -31,10 +31,6 @@ utility = function () {
         return getOsgiService('org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService');
     };
 
-    publicMethods.getUserManagementService = function () {
-        return getOsgiService('org.wso2.carbon.device.mgt.user.core.UserManager');
-    };
-
     publicMethods.getPolicyManagementService = function () {
         return getOsgiService('org.wso2.carbon.policy.mgt.core.PolicyManagerService');
     };