community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
charithag 2015-07-23 15:35:08 +05:30
commit 52e0b66b58
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/distribution/src/assembly/bin.xml
View File

@ -572,16 +572,6 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </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--> <!--License Config file-->
<file> <file>
<source> <source>

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

@ -26,6 +26,7 @@ var constants = require("/modules/constants.js");
var dcProps = require('/config/dc-props.js').config(); var dcProps = require('/config/dc-props.js').config();
var userModule = require("/modules/user.js").userModule; var userModule = require("/modules/user.js").userModule;
var deviceModule = require("/modules/device.js").deviceModule; var deviceModule = require("/modules/device.js").deviceModule;
var utility = require("/modules/utility.js").utility;
var deviceManagementService = utility.getDeviceManagementService(); var deviceManagementService = utility.getDeviceManagementService();
var result; var result;

2
modules/distribution/src/repository/jaggeryapps/iotserver/modules/utility.js
View File

@ -32,7 +32,7 @@ utility = function () {
}; };
publicMethods.getUserManagementService = 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 () { publicMethods.getPolicyManagementService = function () {