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

few changes after test

Browse Source
This commit is contained in:
ayyoob 2015-07-22 11:10:33 +05:30
parent 3740712d96
commit 5b5df161fc
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
View File

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

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

@ -42,7 +42,7 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
log.debug("User Logged In : " + user); log.debug("User Logged In : " + user);
} }
var hasDevcies = (deviceManagementService.getDeviceListOfUser(username).size() >= 1); var hasDevcies = (deviceManagementService.getDevicesOfUser(username).size() >= 1);
if(hasDevcies){ if(hasDevcies){
response.sendRedirect(constants.WEB_APP_CONTEXT+"/devices"); response.sendRedirect(constants.WEB_APP_CONTEXT+"/devices");

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

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

7
modules/p2-profile-gen/pom.xml
View File

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