Commit Graph

759 Commits (062a843ca2ceff551678ac70139d6d85b171ad32)

Author SHA1 Message Date
geethkokila c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 20873e7786 Added null checks
9 years ago
geethkokila c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
9 years ago
Your Name b906d43cc8 Committing tenant configuration manager service
9 years ago
geethkokila bcb2c1ddb1 Commiting the monitoring changes and test case changes
9 years ago
geethkokila 44b496d350 Partially commiting due to update
9 years ago
hasuniea 7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 69cf3f8939 Cleaned code and added comments
9 years ago
mharindu abc16557dc Removed unnecessary new lines in DeviceDAOImpl
9 years ago
mharindu 460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl
9 years ago
harshanl aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps
9 years ago
mharindu 8c748b3dfd Removed unnecessary comments
9 years ago
hasuniea 9f6dd55223 fixed issue in modify enrollment
9 years ago
harshanl 1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 3582973f84 Code cleanup
9 years ago
prabathabey d4c5d9023e Adding necessary instructions for transaction handling
9 years ago
prabathabey de2c378214 Code cleanup
9 years ago
harshanl 423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey ce0cc1699f Fixing more transaction handling related issues
9 years ago
prabathabey cdbdc86f42 Fixing transactional anomalies and code cleanup
9 years ago
harshanl 076d60ec83 PermissionManager changes
9 years ago
prabathabey d7e363cef7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 00807e8295 Fixing transaction anomalies and code clean up
9 years ago
Prabath Abeysekara a5c9886c63 Merge pull request #25 from milanperera/master
9 years ago
mharindu f36c82b059 Refactored LicenseManager
9 years ago
mharindu 4709107719 Refactored LicenseManager
9 years ago
mharindu 8949992148 Fixed 204 issue in LicenseManager
9 years ago
Dilshan Edirisuriya 3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 4e5a38998d Updating DAO Layer
9 years ago
dilanua df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus
9 years ago
geethkokila 149b743a2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 58c45c92be Fixed tenant configuration persisting issue
9 years ago
geethkokila c039adf4ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey c41f6c3002 Code cleanup
9 years ago
geethkokila 3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
milanperera e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp)
9 years ago
milanperera 508082808c Fixed a bug in commons.licence
9 years ago
prabathabey 84bc22f9f3 Setting default values for fields validFrom and validTo
9 years ago
prabathabey 536e13b0a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 53302070e6 Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl
9 years ago
geethkokila cb489c0174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 37763b7e40 Importing org.wso2.carbon.device.mgt.common
9 years ago
geethkokila b8462b02ac Fixing the conflicts
9 years ago
prabathabey c134cc7e25 Fixing license manager initialization related issues and code cleanup
9 years ago
prabathabey ca38cc9f51 Removing URL printer start-up handler from device.mgt.core
9 years ago
prabathabey c471017c40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 134b4ae53c Code cleanup
9 years ago
Dilshan Edirisuriya e7f02365a8 Importing axis2.transport.mail
9 years ago
prabathabey 54cd6b80f4 Fixing merge conflicts
9 years ago
prabathabey 955c119006 Adding policy delegation
9 years ago
geethkokila dc205aa081 Fixing the conflicts
9 years ago
geethkokila 6d687364c6 Fixing the monitoring tasks
9 years ago
milanperera 256880089e Merged
9 years ago
prabathabey 1716c2c7f6 Making apimgt extensions module a separate component/feature pair
9 years ago
prabathabey 1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
9 years ago
milanperera 5b2e0c8989 Merged
9 years ago
prabathabey a68ca0cfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 8394b63e0c Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
9 years ago
milanperera 7ec10d670c Fixed bugs in device disenrolment
9 years ago
milanperera 5a8975d7ac Partial Commit
9 years ago
milanperera 35ce4be1a1 Partial Commit
9 years ago
Prabath Abeysekara 3512e3e60a Merge pull request #20 from milanperera/master
9 years ago
milanperera 6f56e27f1d Refactored SQL queries
9 years ago
prabathabey 6c857fdc4d Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
9 years ago
geethkokila bd75f70a24 Fixing the merge conflicts
9 years ago
geethkokila 6270dff93c Fixing priviledege carbon context issue in device-mgt component
9 years ago
prabathabey d9459b09ba Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey fac53e4814 Upgrading tomcat version usd in carbon-devicemgt
9 years ago
prabathabey 9e5e3cf73d Enforcing proxy port to be used when configured
9 years ago
prabathabey e4fd0607e8 Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
9 years ago
prabathabey 15d56e29c3 temporarily commenting out test cases till tenancy-test bits are properly added
9 years ago
geethkokila 9dc5a1e2e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila aee2402d0d Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
9 years ago
harshanl c2ef90d399 added class comments
9 years ago
harshanl 50640c9dfd Added tenant configuration persistance
9 years ago
prabathabey 7d089d8b09 Removing IDE warnings
9 years ago
prabathabey a461e887d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 87e632866b Fixing connection leaks spotted in operation management implementation
9 years ago
harshanl 57299063b3 Added policy configuration to the cdm-config
9 years ago
manoj 4049d1a2b4 Remove properties from config operations
9 years ago
geethkokila 38939d6c7b Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
9 years ago
prabathabey ff2c29a158 Registering license managment service
9 years ago
manoj ac3438e2cd Code refactor application update
9 years ago
milanperera 05fd385d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj f8c1cbc405 change generated keys to prepared statement constant
9 years ago
manoj b0a55a55c8 code clean up
9 years ago
milanperera f14ba29d30 Merged
9 years ago
milanperera 854b7dda8d Merged
9 years ago
manoj a6cee6bae3 change update operation response to object
9 years ago
manoj 3bbbed40e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 25a8f60d74 Retuen int for operations
9 years ago
kasundananjaya 2d1433a2f0 Merge pull request #16 from milanperera/master
9 years ago
manoj 27279426f0 code clean up
9 years ago
manoj 00819fe4b6 Unit tests, application update
9 years ago
manoj de17217303 Unit tests, application update
9 years ago
milanperera a82351f53f Refactered getDevicesByType query
9 years ago
milanperera a5a9d02dee Implemented getDeviceByStatus function
9 years ago
manoj 6daa71771c Unit tests for service layer
9 years ago
manoj 41d1408b14 Add application update and unit tests
9 years ago
manoj da61c08fac Add application update and unit tests
9 years ago
mharindu 0a671373e5 Merged with local changes
9 years ago
mharindu 9d8c52958d Refactored SQL queries and added null checks
9 years ago
prabathabey a886430005 Initializing Device Management providers
9 years ago
prabathabey fd6793a9af Fixing device management API structure
9 years ago
manoj 0e2e0fdd0e Remove package attribute form Application
9 years ago
Dilshan Edirisuriya 3908705b68 Null check
9 years ago
geethkokila 388701c3a2 Adding partial commit to add a interface for plugins to implement to notify devices for monotoring
9 years ago
prabathabey dea6d12173 Fixing more issues in SQL queries used in DeviceDAOImpl
10 years ago
prabathabey 043440eb76 Fixing an invalid table name used in getDevices() method
10 years ago
manoj 286a04dd31 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj cc5dd3baa6 Move add application list, get applist methods to applicationServiceProvider
10 years ago
geethkokila 8bc7c5824a Fixing test case failures and device dao errors
10 years ago
manoj 66afd0be4b Change updateApplicationList method
10 years ago
manoj a8ae030fe7 Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins
10 years ago
prabathabey 431c86ae0e Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console
10 years ago
prabathabey 7a6e947810 Making Device object return enrolment data too
10 years ago
prabathabey 974a616737 DAO refactoring
10 years ago
prabathabey 8d348a358c Committing initial version of supporting device life cycle management
10 years ago
harshanl 952db0183d Moved updateApplicationListOfDevice method to DeviceMgtService
10 years ago
Dilshan Edirisuriya 8c59d82708 Making serializable
10 years ago
harshanl 20a9d1222f Added a method to retrieve list of applications installed on a device
10 years ago
manoj d30048d94d change properties
10 years ago
manoj 65b1ea70ab Add properties to store mobile app specific meta data
10 years ago
manoj 567f78abb6 Add additional fields to load device
10 years ago
prabathabey d28de90679 Fixing an invalid database table name used in DeviceDAOImpl
10 years ago
manoj f3dd402e4b Set device status to active when poll operations
10 years ago
manoj 6263a550ff Set device enrolment status
10 years ago
manoj 65620a7389 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 83698e7a99 AppList update for device
10 years ago
manoj 1aa22b29c5 AppList update for device
10 years ago
manoj 4510a954a5 AppList update for device
10 years ago
prabathabey 1dd9134e5d Fixing poms to remove device.mgt.user.* dependencies
10 years ago
prabathabey 22bf894d45 Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository
10 years ago
manoj 78ee8e334f Remove app list update method from app manager interface
10 years ago
manoj 6f2c51ee36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 82cbbef83b Application list saving method and device operation response saving
10 years ago
prabathabey 60ee259b2b Fixing DeviceDAOs to associate tenant id to filter out tenant specific resources
10 years ago
manoj 0e18ebcf4e Synchronize plugin register
10 years ago
manoj aa8de8cb23 Add all registerd devices to newly registerd plugin listner
10 years ago
manoj 7497a1d033 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 856fea3455 fix instansiating of device provider serviceImpl with empty plugin repo
10 years ago
prabathabey c0cbc59a03 Code cleanup
10 years ago
prabathabey a2dc916fd0 Fixing issues in plugin initialization as a result of certain plugins getting initialized after the device management component is done getting configured
10 years ago
prabathabey 2526d87c21 Introducing a separate bean to carry all enrolment data
10 years ago
prabathabey 60960d80b4 More code cleanups
10 years ago
prabathabey c13975191e Code cleanup
10 years ago
manoj 0de6ff09e7 Change get device by name query
10 years ago
manoj 21ea3a4428 change device type query
10 years ago
manoj 651cfdc6cb Check if pending operations empty
10 years ago
manoj 61ebf6beb4 Remove status field from get next operations query
10 years ago
manoj 6a1cf1b3f8 Remove status field from get next operations query
10 years ago
Dulitha Wijewantha 34a8641582 * Added update device implementation
10 years ago
manoj 05a3244040 Add payload to policy operation
10 years ago
manoj 0f7df72167 Cast to operation type in dto convertion
10 years ago
manoj 245d3706a2 Invoke policy operation dao
10 years ago
manoj e948075bc5 Invoke policy operation dao
10 years ago
manoj 6188878340 Add operation code for policy operation
10 years ago
manoj a4e6b02e60 Add operation type for policy operation
10 years ago
manoj 14c6773b57 Fetch device according to the device identifier
10 years ago
manoj 39b85a3b44 update operation status
10 years ago
manoj 0ed9c46a64 set operation status
10 years ago
manoj f68c7133cf Check null before close connection
10 years ago
manoj 3dcb42ee64 fix connection close issue while call super getOperation method inside loop
10 years ago
manoj 9f592f8a33 fix operation id field issue
10 years ago
manoj 3c99c9ec2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 7fb3a594b8 Instansiate Policy DAO in operations dao factory
10 years ago
prabathabey 6c6f644892 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey de9b17f41f Modifying Device bean definition
10 years ago
manoj f8fbbdb467 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj d15f19dab2 correct sql ambiguos selection of operation id
10 years ago
prabathabey cdcba23021 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 72e940b523 Code cleanup
10 years ago
manoj e2ef2504a9 Y
10 years ago
prabathabey d444f4ce0c Adding an interface method to DeviceManager.java to support claimable devices
10 years ago
manoj 54c776000f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-1.0.0
10 years ago
manoj c3805364c9 Refractor Operations to handle Policy Operations and remove joins
10 years ago
manoj 917c0cf965 Refractor Operations to handle Policy Operations and remove joins
10 years ago
mharindu 3d549701a4 Fixed query issue in function getDevicesByName
10 years ago
mharindu de8914fdcb Added a function to retrieve device list from device name
10 years ago
manoj f2c33f9421 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj cfe9bd5f9f Email format
10 years ago
dilanua 851fb35554 Updated DeviceTypeDAOImpl.java
10 years ago
mharindu ffaccbe371 Refactored policy
10 years ago
manoj 48a2062f64 Add operations for effective policy
10 years ago
mharindu 39ae880972 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
mharindu 89d0fa0894 Implemented device count and policy count
10 years ago
manoj acdf6021a7 Policy related operations
10 years ago
manoj 85df7ca9a0 Policy related operations
10 years ago
mharindu 3d69503e96 Merged
10 years ago
mharindu 048c175fda Fixed issue of get device info function
10 years ago
Milan Perera c068ac88de Update DeviceManagementServiceImpl.java
10 years ago
Milan Perera 7d3bf84d9f Update DeviceManagementServiceProviderImpl.java
10 years ago
Milan Perera 8f00128ab1 Update DeviceManager.java
10 years ago
mharindu 40feabb9df Fixed bug in device disenrollment
10 years ago
mharindu 847eb073b9 Refactored device info
10 years ago
mharindu ead4d3be69 Refactored device info
10 years ago
manoj f25dc65b54 Refractor device mgt user core service
10 years ago
manoj c918622cc6 Refractor Email service and change user server feature name
10 years ago
mharindu 6b84d65e29 Refactored updateDeviceInfo function
10 years ago
manoj 6c80688af2 Remove app list from device info update service
10 years ago