800fa4fb9a
add some modifications to operation template
2 years ago
7562c1fbf1
Operation Template implementation
2 years ago
Nishan Sangeeth
00b2c06ec0
Fix-invite-users-issue
...
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2 years ago
Pasindu Rupasinghe
07c157e9d6
Fix URL Generation, Make feature, Refactor the module
2 years ago
fa7ee67aed
[maven-release-plugin] prepare for next development iteration
2 years ago
71007cc03c
[maven-release-plugin] prepare release v5.0.25
2 years ago
Kavindya Devindi
47990e4a16
Add subtype-mgt feature ( #74 )
...
## Purpose
To seperate out component with main generic things of subtype management.
## Goals
This subtype-mgt component enables the dynamic implementation of any subtypes using APIs. PFA
## Approach
* Add generic methods to subtype management component.
* Add cacheloader mechanism to optimum data loading part.
* Add unit test cases for all subtype's methods.
## Documentation
Requirement & Design Approach of Subtype Management ->
https://docs.google.com/document/d/1Cp7LqFKuV2FZOhN-cOCveLYcjyrzbZTDA0gNPYuV918/edit?usp=sharing
## Automation tests
- Unit tests
- service test
- service negative test
- DAO test
- DAO negative test
- Integration tests
> N/A
## Security checks
> N/A
## Related MRs
> N/A
## Test environment
Linux 22.04
## Learning
> N/A
Co-authored-by: kavindya_devindi <kavindyadevindi038@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: #74
Co-authored-by: Kavindya Devindi <kavindya@entgra.io>
Co-committed-by: Kavindya Devindi <kavindya@entgra.io>
2 years ago
Kavin Prathaban
27cceecd33
Fix device enrolment using MSSQL as database ( #72 )
...
## Purpose
* Fixes https://roadmap.entgra.net/issues/9859
## Description
* Fix device enrolment using MSSQL as database
* Fix test case failures of database engine getting a null value
Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: #72
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2 years ago
Rajitha Kumara
4c2a02fdf0
Add license
2 years ago
Rajitha Kumara
64d194bfea
add tenant-mgt module
2 years ago
3238e78f0c
[maven-release-plugin] prepare for next development iteration
2 years ago
6d43a16ab2
[maven-release-plugin] prepare release v5.0.24
2 years ago
994f49db16
Add missing db scripts
2 years ago
b75cabfce7
[maven-release-plugin] prepare for next development iteration
2 years ago
c8e176c930
[maven-release-plugin] prepare release v5.0.23
2 years ago
Lasantha Dharmakeerthi
f06a27c46e
Add try it now feature ( #99 )
...
Co-authored-by: Dharmakeerthi Lasantha <tcdlpds@gmail.com>
Reviewed-on: #99
Co-authored-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
Co-committed-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
2 years ago
dda5860e57
[maven-release-plugin] prepare for next development iteration
2 years ago
abb66486d8
[maven-release-plugin] prepare release v5.0.22
2 years ago
Lasantha Dharmakeerthi
b53bfdf780
Add offset and limit when querying policies from DAO layer
2 years ago
Shamalka Navod
fbbd07d262
Restructure Traccar integration on device management ( #81 )
...
Co-authored-by: shamalka <shamalkanavod95@gmail.com>
Reviewed-on: #81
Co-authored-by: Shamalka Navod <shamalka@entgra.io>
Co-committed-by: Shamalka Navod <shamalka@entgra.io>
2 years ago
708d6be59d
Add offset and limit when querying policies from DAO layer
2 years ago
f5ef8bafd6
[maven-release-plugin] prepare for next development iteration
2 years ago
5720651046
[maven-release-plugin] prepare release v5.0.21
2 years ago
Pahansith Gunathilake
5610ac7bec
Merge branch 'master' into suspend-package
2 years ago
95d4afbc3b
Fix PR comments
2 years ago
ad7466ee1e
Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into pr/feature/whitelabel
2 years ago
19750486de
Add improvements
2 years ago
35a09566e4
Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into pr/feature/whitelabel
2 years ago
3c13196aa5
fixed feature installation issue
2 years ago
766606f9f7
added analytics extension to persist event streams,receivers,publishers
2 years ago
9b9defed19
Resolve conflicts
2 years ago
5275bb180e
Change config implementation
...
fixes https://roadmap.entgra.net/issues/9939
2 years ago
d2bc463284
Resolve comments
...
fixes http://roadmap.entgra.net/issues/9939
2 years ago
6962e94d44
Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into self-guiding-ui-9939
2 years ago
f89e71d4bf
Reuse email implementation
...
fixes http://roadmap.entgra.net/issues/9939
2 years ago
Lasantha Dharmakeerthi
65c93aea81
Add improvements for chat feature
2 years ago
798e851922
Add modifications
2 years ago
Pramila Niroshan
1923fb7dfb
Remove log4j2.properties file
2 years ago
24064b650b
Resolve conflict
2 years ago
2d1879d1b6
Changes on reviews
2 years ago
Pramila Niroshan
c168503994
log4j2.properties file added
2 years ago
Pramila Niroshan
7441e57d36
Refactor log context name
2 years ago
Pramila Niroshan
4005a9e8cb
User log context added
2 years ago
Pramila Niroshan
950f67da5f
Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into entgra-logger
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# pom.xml
2 years ago
800694de97
introduce new datasource for events
2 years ago
4d8d4bdcf7
[maven-release-plugin] prepare for next development iteration
2 years ago
1b363c0978
[maven-release-plugin] prepare release v5.0.20
2 years ago
2b7c8c1c82
Ability to disable or enable apps
...
Fixes https://roadmap.entgra.net/issues/10008
2 years ago
0f6db69c18
Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into live-chat-feature
2 years ago
74f50b28c5
Add user identification improvement
2 years ago
0bbcac4a93
Add enrollment guide permissions
...
fixes https://roadmap.entgra.net/issues/9939
2 years ago
5fca50f8d7
Change latitude and longitude datatype
2 years ago
e4a5f49b9c
Fix dynamic task tables
2 years ago
a3eca63dfd
Fix mssql dbscripts of DM_DB, APPM_DB
2 years ago
Chamindu Senanayake
89e72bdf86
Add dynamic task manager and task watcher ( #65 )
...
## Purpose
To Distribute dynamic task execution in multiple nodes.
## Goals
This allows distribute task execution in multiple nodes. Especially this is useful, when system has multiple nodes
## Approach
- Add task manager to handle dynamic tasks and dynamic task properties while adding task into the wso2 ntask core.
- Add task watcher to run periodically after iot server start up and compare tasks from Entgra task manager and wso2 ntask core.
- Add configuration to enable task monitoring in task watcher.
## Documentation
> N/A
## Automation tests
- Unit tests
> N/A
- Integration tests
> N/A
## Security checks
> N/A
## Related MRs
> N/A
## Test environment
Linux 22.04
## Learning
> N/A
Reviewed-on: #65
Co-authored-by: Chamindu Senanayake <chamindu@entgra.io>
Co-committed-by: Chamindu Senanayake <chamindu@entgra.io>
2 years ago
2d56b0ea9a
[maven-release-plugin] prepare for next development iteration
2 years ago
73d17e61a8
[maven-release-plugin] prepare release v5.0.19
2 years ago
Pahansith Gunathilake
2926c2e523
Add unique key constraint into AP_DEVICE_SUBSCRIPTION tables
2 years ago
d715609b53
[maven-release-plugin] prepare for next development iteration
2 years ago
0beeedef43
[maven-release-plugin] prepare release v5.0.18
2 years ago
Pahansith Gunathilake
5228a84400
Revert "Change the device status and see the device status lifecycle history ( #58 )"
...
This reverts commit 7f327bac08
2 years ago
9f724eeffb
[maven-release-plugin] prepare for next development iteration
2 years ago
50bc5560f8
[maven-release-plugin] prepare release v5.0.17
2 years ago
Kavin Prathaban
846d7a0f59
Add support to perform group operations ( #59 )
...
## Purpose
* Fixes https://roadmap.entgra.net/issues/8916
## Description
* Created a new API to check whether groups has relevant(Android, iOS, Windows) device types.
Co-authored-by: Arshana <arshana790@gmail.com>
Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: #59
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2 years ago
Pramila Niroshan
12b3b1a41d
Add missing dependency
2 years ago
Kavin Prathaban
7f327bac08
Change the device status and see the device status lifecycle history ( #58 )
...
## Purpose
* Fixes https://roadmap.entgra.net/issues/9266
## Feature
* Change device's status and view device's status life-cycle history
## Approach
* Created a API for change status and store changed status in to database.
* Created another API to view the device's life-cycle status history.
* lifecycle of the status is as shown in the diagram.
* lifecycle Status are taken from a xml file.
Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: #58
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2 years ago
Navod Zoysa
2e2e9abc90
Add Android alternate app install permission to UI config ( #55 )
...
## Purpose
Add permission scope for alternate app install feature so that the operation can be triggered through device operation UI.
Issue - https://roadmap.entgra.net/issues/9641
Co-authored-by: navodzoysa <navod.zoysa@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: #55
Co-authored-by: Navod Zoysa <navod@entgra.io>
Co-committed-by: Navod Zoysa <navod@entgra.io>
2 years ago
Pramila Niroshan
9401a4501b
Add Entgra Device Notification Feature
2 years ago
071b9486bb
[maven-release-plugin] prepare for next development iteration
2 years ago
cf305362b4
[maven-release-plugin] prepare release v5.0.16
2 years ago
Pahansith Gunathilake
9ef3e0cf6e
Revert "Change the device status and see the device status lifecycle history"
...
This reverts commit df6a8e20a3
2 years ago
a5177208f8
Add icon and resolve bug
...
fixes https://roadmap.entgra.net/issues/9274
2 years ago
df6a8e20a3
Change the device status and see the device status lifecycle history
2 years ago
21669f8dba
Resolve conflicts
...
fixes https://roadmap.entgra.net/issues/9274
2 years ago
01aaa44e89
improve OTP mgt service functionalities
2 years ago
Lasantha Dharmakeerthi
c03e1359d3
Add download URL generating method
2 years ago
d55ea733e7
Add download URL generating method
2 years ago
Oshani Silva
a93f534e06
Improve billing feature
...
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2 years ago
1b2bddb167
[maven-release-plugin] prepare for next development iteration
2 years ago
fb4e20490a
[maven-release-plugin] prepare release v5.0.15
2 years ago
Sanjana Rajapakshe
05f7a61af0
Fix incorrect date type issue
...
Co-authored-by: Sanjana Rajapakshe <sanjana@entgra.io>
Co-committed-by: Sanjana Rajapakshe <sanjana@entgra.io>
2 years ago
9d3e5fbc3a
[maven-release-plugin] prepare for next development iteration
2 years ago
744881d21e
[maven-release-plugin] prepare release v5.0.14
2 years ago
Amalka Subasinghe
ec7ebcc384
added device-extensions, logger, default-role-manager, stateengine ( #8 )
...
Co-authored-by: Amalka Subasinghe <amalkasubasinghe@gmail.com>
Reviewed-on: #8
Co-authored-by: Amalka Subasinghe <amalka@entgra.io>
Co-committed-by: Amalka Subasinghe <amalka@entgra.io>
2 years ago
b18ddfedce
[maven-release-plugin] prepare for next development iteration
2 years ago
ec8d08ca63
[maven-release-plugin] prepare release v5.0.13
2 years ago
Vigneshan Seshamany
0d43e7d6aa
Fix dcr and token endpoint related issues
2 years ago
b9f2bf9246
[maven-release-plugin] prepare for next development iteration
2 years ago
8f610eea63
[maven-release-plugin] prepare release v5.0.12
2 years ago
Shamalka Navod
df5cdb5240
Fix traccar issues ( #5 )
...
* Fix traccar client thredpool issue
* Refactor traccar implementation
* Fix traccar loading issue
Co-authored-by: shamalka <shamalkanavod95@gmail.com>
Reviewed-on: #5
Co-authored-by: Shamalka Navod <shamalka@entgra.io>
Co-committed-by: Shamalka Navod <shamalka@entgra.io>
2 years ago
d2a194b37d
Add device operation cleanup scripts
2 years ago
53cffea5d3
remove mdm-ui-config j2 file, since when scope list too long cannot configured in deployment.toml
2 years ago
f6b3af2e90
Fix permanant delete issue
2 years ago
223637c887
[maven-release-plugin] prepare for next development iteration
2 years ago
b7311af447
[maven-release-plugin] prepare release v5.0.11
2 years ago
eaad94b3e9
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
cc98f6a881
Update config files to fix billing UI isssues
2 years ago
b311908d47
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
5ff9ef7782
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
ccf8e108c0
Add remove account scope
2 years ago
Vigneshan Seshamany
638c6b12c9
Fix cross-tenant api subscription issue
2 years ago
426dcf16bf
Merge branch 'ui-config' into 'master'
...
Add Windows permission scopes to ui config
See merge request entgra/carbon-device-mgt!895
2 years ago
3c9fc68619
[maven-release-plugin] prepare for next development iteration
2 years ago
0b4fe08847
[maven-release-plugin] prepare release v5.0.10
2 years ago
Vigneshan Seshamany
ebc5f5de31
Implement multi-tenant api publishing
2 years ago
0290758c25
[maven-release-plugin] prepare for next development iteration
2 years ago
790ab62b34
[maven-release-plugin] prepare release v5.0.9
2 years ago
7f96ce3c33
[maven-release-plugin] prepare for next development iteration
2 years ago
e851e21bcd
[maven-release-plugin] prepare release v5.0.8
2 years ago
Rushdi Mohamed
6f79180920
removed unwanted codes
2 years ago
Rushdi Mohamed
e88d5e9c3b
Add traccar configuration on p2.inf and updated mysql.sql
2 years ago
eb061f9450
Refator page tite to app title
2 years ago
78546125bc
Add page title to whitelable
2 years ago
Rushdi Mohamed
f61ab0ae69
update p2.inf for traccar
2 years ago
Rushdi Mohamed
515e826711
Update with callable thread and add set/remove user permission on enroll/disenroll device
3 years ago
Rushdi Mohamed
1a7442ba3d
Update h2.sql script
3 years ago
Rushdi Mohamed
d1f2bdb296
update the threadpool apporoach/ add traccar devices/groups for existing UEM devices/groups
3 years ago
Rushdi Mohamed
9d9ff9f391
Update h2.sql with traccar group/device mapping tables
3 years ago
768950bbb1
Add whitelabel metadata configuration to cdm-config
3 years ago
1d84adbb4f
Add java doc comment
...
Fix adding default white label on tenant create
Add whitelabel logo and favicon apis as non secured endpoints
Fix License
3 years ago
7907a1c5ff
Add tenant whitelabeling api
...
Make whitelabel favion and logo api public
Refactor whitelabeling feature in separate classes
3 years ago
f1585a93b9
Add Windows permission scopes to ui conifg
3 years ago
8636767cba
[maven-release-plugin] prepare for next development iteration
3 years ago
9af9bea2b6
[maven-release-plugin] prepare release v5.0.7
3 years ago
dc84f354c9
Fix issue in parsing pom.xml in APIM keymgt feature
3 years ago
d1754b465e
Merge branch 'fix/permissions' into 'master'
...
Fix identity server connect permission
See merge request entgra/carbon-device-mgt!887
3 years ago
b894d371fb
Merge branch 'master' into 'master'
...
Implement api keymgt extension
See merge request entgra/carbon-device-mgt!890
3 years ago
Vigneshan Seshamany
2e8d1fabf0
Implement api keymgt extension
3 years ago
47fb2c77f5
Merge branch 'billing-api-1226' into 'master'
...
Adding the new billing API
See merge request entgra/carbon-device-mgt!848
3 years ago
817dc57862
[maven-release-plugin] prepare for next development iteration
3 years ago
7196d2daea
[maven-release-plugin] prepare release v5.0.6
3 years ago
695f4c4a18
Add identity server connect scope to ui conf template
3 years ago
6b91c89ad0
Add identity server create permission to ui configuration
3 years ago
75f825a713
Fix dbscript syntax
3 years ago
fb331e0089
Merge branch 'fix/sp-app/dbscripts' into 'master'
...
Fix service provider app integration dbscripts
See merge request entgra/carbon-device-mgt!883
3 years ago
2f1228d845
Merge branch 'windows-scopes' into 'master'
...
Add missing permission scopes for windows device operations
See merge request entgra/carbon-device-mgt!878
3 years ago
2721588635
Merge branch 'fix-change-supadmin' into 'master'
...
Fix invalid config entries
See merge request entgra/carbon-device-mgt!880
3 years ago
cc15df69cc
Fix AP_IDENTITY_SERVER table script
3 years ago
cadc9c9c87
Fix service provider app integration dbscripts
3 years ago
ba53197ab7
Fix invalid config entries
3 years ago
aa2fa45a5f
Tempory merge conflict resolution
3 years ago
b11f4d08f7
Add missing permission scopes for windows device operations
3 years ago
f86617a264
Add the sql files
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
db1aab1f3a
Add identity service provider config
3 years ago
7ba8311c93
fix conflict
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
946a12b84d
[maven-release-plugin] prepare for next development iteration
3 years ago
f55ffbb19a
[maven-release-plugin] prepare release v5.0.5
3 years ago
39216aa651
[maven-release-plugin] prepare for next development iteration
3 years ago
8deff13edd
[maven-release-plugin] prepare release v5.0.4
3 years ago
c0e5edded2
Add sql scripts to favourites table
...
Fix error logging in DAO layer
3 years ago
236d356a26
Merge branch 'pr/temp/feature/subscription/status/change' into 'master'
...
API to change application subscription status
See merge request entgra/carbon-device-mgt!868
3 years ago
65f5efb638
Add APIs to get favourite apps
3 years ago
053a57c4f5
Add getting billing cost by domain change
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
0dd9bb2937
Add operation status update wrapper api to store
3 years ago
96e4aa8436
[maven-release-plugin] prepare for next development iteration
3 years ago
739266feca
[maven-release-plugin] prepare release v5.0.3
3 years ago
6a150b579c
Fix reporting config default db name
3 years ago
0cf45cdecf
Fix android operation buttons not enabling
3 years ago
5e247c6e6b
Add identity server service provider app integration
3 years ago
791436d061
Add android device info operation permission
3 years ago
06560d24d4
[maven-release-plugin] prepare for next development iteration
3 years ago
2784633dd6
[maven-release-plugin] prepare release v5.0.2
3 years ago
a7400e7074
Bump dependency versions of analytics-mgt
3 years ago
4e73b778e2
Move grafana to separate module
3 years ago
1896199698
[maven-release-plugin] prepare for next development iteration
3 years ago
a765f780f0
[maven-release-plugin] prepare release v5.0.1
3 years ago
4ed28820c8
operation timeout feature
3 years ago
ef558458a0
[maven-release-plugin] prepare for next development iteration
3 years ago
8e191e75a6
[maven-release-plugin] prepare release v5.0.0
3 years ago
8b6a3ef77c
Merge branch 'master' into 'master'
...
adding device status history feature
See merge request entgra/carbon-device-mgt!836
3 years ago
7e7fa53b8f
adding device status history feature
3 years ago
4cdd8dcb2f
Merge branch 'master' into 'master'
...
Fix not picking up or push_notification_provider in cdm config template
See merge request entgra/carbon-device-mgt!833
3 years ago
1f536c40e4
Added grafana integration
3 years ago
2e9832caa6
[maven-release-plugin] prepare for next development iteration
3 years ago
6b0c527bb2
[maven-release-plugin] prepare release v5.0.0
3 years ago
7f23347701
Fix not picking up or push_notification_provider in cdm config template
3 years ago
d7ccaa559b
[maven-release-plugin] prepare for next development iteration
3 years ago
907fb825ea
[maven-release-plugin] prepare release v5.0.0
3 years ago
b61c97d603
Make timestamps independent from host machine timezone
3 years ago
376cb4ec92
Add missing ios scopes into ios.xml.j2
3 years ago
fbfd9ba911
ios enrollment fixes
...
Fixes https://gitlab.com/entgra/product-iots/-/issues/1184
3 years ago
216e47b429
[maven-release-plugin] prepare for next development iteration
3 years ago
5c2dc99b09
[maven-release-plugin] prepare release v5.0.0
3 years ago
9a86d2fe06
Add missing scope for the device info operation button
3 years ago
a031579b80
fixed gw, km, iot, apim urls
3 years ago
5272293a31
mdm config tags made configurable
3 years ago
29b561e9c3
added config to j2 file
3 years ago
4503ab77c7
package name change - appmgt
3 years ago
37b08ba389
package name change - appmgt core
3 years ago
f9274b0d1a
update from master
3 years ago
76deadcf41
Merge branch 'master' into 'master'
...
Login cache improvements and Refresh token handling improvements
See merge request entgra/carbon-device-mgt!789
3 years ago
939e9faeff
Merge branch 'hierarchical-grouping' into 'master'
...
Hierarchical grouping
See merge request entgra/carbon-device-mgt!780
3 years ago
Vigneshan Seshamany
0eb74d9f60
Modify login cache implementatation with LRU cache
3 years ago
f3720e49ff
added scripts and updated config reading
3 years ago
bdb01a0098
bug fixing
3 years ago
a418fe5d0d
Merge branch 'master' into kernel-4.6.2
3 years ago
c2dd2130b4
Merge branch 'master' into 'master'
...
Update DM_DEVICE_INFO table
See merge request entgra/carbon-device-mgt!776
3 years ago
e403a92db9
Add PARENT_PATH column to DM_GROUP table
3 years ago
d090fef2ac
updated from master and added oauth2 component
3 years ago
8f689c8101
Add default sim update operation scope
...
https://gitlab.com/entgra/product-iots/-/issues/991
3 years ago
Thameera
Nishan Sangeeth
Pasindu Rupasinghe
builder
Kavindya Devindi
Kavin Prathaban
Rajitha Kumara
shamalka
Lasantha Dharmakeerthi
Shamalka Navod
navodzoysa
Pahansith Gunathilake
osh
Thashmi-nil
Amalka Subasinghe
Pramila Niroshan
inoshperera
prathabanKavin
Chamindu Senanayake
Navod Zoysa
Dharmakeerthi Lasantha
Oshani Silva
Sanjana Rajapakshe
Amalka Subasinghe
Vigneshan Seshamany
Amalka Subasinghe
amith10
Pahansith Gunathilake
Rushdi Mohamed
Mohamed Rashd
Mohamed Rashd
Muhammad Rashad
Don Kushan Saminda Wijeratne
Saad Sahibjan
sandaru