Commit Graph

1013 Commits (19758214466a5e3c513a8ebd0311d1b43ab6dc75)

Author SHA1 Message Date
mharindu 3421663724 Fixed conflics and merged
9 years ago
geethkokila 4500aacd38 Adding the scep support for getting the device tenant id
9 years ago
mharindu 2f5ef48fa8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila d2fe9679e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 11ead87a5e Fixing the policy listing issue
9 years ago
mharindu 0e7ff3c0c8 Merged
9 years ago
hasuniea 0c0d54f041 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea 581c4f013b refactored changes
9 years ago
mharindu 59654848ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey bd6316d8b5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey dbf95bcc7c Fixing an issue in the logic of authentication incoming requests
9 years ago
milanperera 23bb023686 Partial Commit for Permission Authorizer module
9 years ago
mharindu 069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 30dfa7600e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bbec523a47 Added notification mechanism
9 years ago
prabathabey 46c5f2534f Fixing NoSuchElement exception thrown when standard context is accessed
9 years ago
mharindu 7a801c46eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 6ef4bdd73e Fixing enrolment id issues
9 years ago
mharindu 5bcc020b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey dc2680ac5e Making APIPublisher util compose the relevant API endpoint url programmatically
9 years ago
prabathabey 256c42243f Improving APIPublisher implementation
9 years ago
prabathabey 9288e3846d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 4334994b36 Fixing issues encountered in APIPublisher implementation
9 years ago
harshanl d7ea5625bc Fixed apimgt publisher component issues
9 years ago
mharindu 6418c55f4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila bdf976ad2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 7dd48bf00e Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
9 years ago
prabathabey 2f22d1c82a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey f2635e9e98 Adding more improvements into web-app authenticator framework
9 years ago
mharindu 97987f6e10 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu cbf10a8b59 Refactored addOperation method
9 years ago
hasuniea 7642112a9f code clean up
9 years ago
Prabath Abeysekara ee0e9af4cb Merge pull request #27 from milanperera/master
9 years ago
Dilshan Edirisuriya 673ef32535 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 454c459172 Extract certificate from signature
9 years ago
mharindu 0c43338f5d Added runtime exception to DCA
9 years ago
mharindu 1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey aa6f311d26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 46c5dba5c5 Improving web-app authenticator framework
9 years ago
geethkokila dff526b272 Removing the unnessary commets and imports
9 years ago
geethkokila 5ee8c0f065 Fixing the cache manager issues
9 years ago
hasuniea 9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 8503a997ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya aeae7a09f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 0140974487 Certificate verification
9 years ago
harshanl e1da84ec55 Added JWT authenticator
9 years ago
mharindu 725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila f2b8f978f5 Fixing the operations connection close problems
9 years ago
mharindu cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila f4b2a9ca3a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila b14461a5af Fixing the datasource issue in the device magt core
9 years ago
Dilshan Edirisuriya d2182e7375 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya d5199dbd62 Fixing issues
9 years ago
mharindu ad5335c9f5 Fixed local conflicts and merged
9 years ago
mharindu 6385c13012 Fixed issues in DeviceDAO
9 years ago
geethkokila 6c5f7d7ada Fixing conflicts and checkcriterion method
9 years ago
prabathabey 26cf4e82da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 2b6bf203e2 Resolving conflicts observed in policy management implementation
9 years ago
geethkokila 044995ed97 Adding the activate method when policies are added.
9 years ago
mharindu a7e3462e91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 39d1af7242 Saving in keystore
9 years ago
mharindu fd29deb372 Fixed conflicts of local repo and merged
9 years ago
prabathabey 892b9681f5 Fixing transaction handling issues
9 years ago
Dilshan Edirisuriya b391681438 Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 3d736d628e adding conf file to touchpoint
9 years ago
geethkokila 458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
9 years ago
geethkokila c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 23c931f5f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 20873e7786 Added null checks
9 years ago
Dilshan Edirisuriya c547d85f35 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
Dilshan Edirisuriya fd84190342 Adding certificate management components
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
mharindu 94326323bc Added class level and method level comments for Policy core
9 years ago
harshanl aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps
9 years ago
mharindu 7fed00a14d Removed unnecessary logs and added null checks in MonitoringManager
9 years ago
mharindu 8c748b3dfd Removed unnecessary comments
9 years ago
mharindu 97c19c23b0 Added method level comments and null checks in DCA
9 years ago
mharindu 5e285071d8 Removed unnecessary white spaces
9 years ago
hasuniea 9f6dd55223 fixed issue in modify enrollment
9 years ago
mharindu a51e7646e3 Fixing issues of previous PRs
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
prabathabey f66d1dd07b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
Dilshan Edirisuriya 6cff144573 Merge pull request #26 from milanperera/master
9 years ago
mharindu fa82a28c0f Added null check to MonitoringManagerImpl
9 years ago
prabathabey 2311572d49 code cleanup
9 years ago
prabathabey cd31662a96 Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
prabathabey 05c3d080e0 Fixing transactional anomalies found in PolicyManagerImpl
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
Dilshan Edirisuriya 5b46a4e2f8 Commenting out unreachable state for now
9 years ago
geethkokila cceb3ac5db Fixing errors and adding caching sketch
9 years ago
dilanua 4e5a38998d Updating DAO Layer
10 years ago
dilanua df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus
10 years ago
geethkokila 90f8f4aab6 Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
10 years ago
geethkokila 149b743a2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
harshanl 58c45c92be Fixed tenant configuration persisting issue
10 years ago
geethkokila c039adf4ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey c41f6c3002 Code cleanup
10 years ago
geethkokila 3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
milanperera e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp)
10 years ago
milanperera 508082808c Fixed a bug in commons.licence
10 years ago
milanperera 596a99d412 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 84bc22f9f3 Setting default values for fields validFrom and validTo
10 years ago
milanperera 05a2339cea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 536e13b0a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 53302070e6 Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl
10 years ago
milanperera df61f9263a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila cb489c0174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
Dilshan Edirisuriya 37763b7e40 Importing org.wso2.carbon.device.mgt.common
10 years ago
milanperera 9fcea34d73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila b8462b02ac Fixing the conflicts
10 years ago
prabathabey c134cc7e25 Fixing license manager initialization related issues and code cleanup
10 years ago
prabathabey ca38cc9f51 Removing URL printer start-up handler from device.mgt.core
10 years ago
prabathabey c471017c40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 134b4ae53c Code cleanup
10 years ago
Dilshan Edirisuriya e7f02365a8 Importing axis2.transport.mail
10 years ago
milanperera c0b0975929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
milanperera 63721cb79d Refactored
10 years ago
prabathabey 54cd6b80f4 Fixing merge conflicts
10 years ago
prabathabey 955c119006 Adding policy delegation
10 years ago
geethkokila dc205aa081 Fixing the conflicts
10 years ago
geethkokila 6d687364c6 Fixing the monitoring tasks
10 years ago
milanperera 256880089e Merged
10 years ago
milanperera f0ec3dbe4c Fixed NPE issues in policy-mgt
10 years ago
prabathabey b298407160 Fixing improper parent configurations found in apimgt.extensions component and feature
10 years ago
prabathabey 1716c2c7f6 Making apimgt extensions module a separate component/feature pair
10 years ago
prabathabey 1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
10 years ago
prabathabey bfa1ea1875 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
milanperera 5b2e0c8989 Merged
10 years ago
geethkokila fde54d2d32 Fixing the monitoring service
10 years ago
prabathabey a68ca0cfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 8394b63e0c Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
10 years ago
milanperera 7ec10d670c Fixed bugs in device disenrolment
10 years ago
milanperera 5a8975d7ac Partial Commit
10 years ago
milanperera 35ce4be1a1 Partial Commit
10 years ago
geethkokila fcb7530d3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila 2769392bc0 Fixing the monitoring task for not to notify the blocked and inactive devices
10 years ago
Prabath Abeysekara 3512e3e60a Merge pull request #20 from milanperera/master
10 years ago
milanperera 6f56e27f1d Refactored SQL queries
10 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
10 years ago
geethkokila bd75f70a24 Fixing the merge conflicts
10 years ago
geethkokila 6270dff93c Fixing priviledege carbon context issue in device-mgt component
10 years ago
prabathabey d9459b09ba Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey fac53e4814 Upgrading tomcat version usd in carbon-devicemgt
10 years ago
prabathabey 9e5e3cf73d Enforcing proxy port to be used when configured
10 years ago
prabathabey e4fd0607e8 Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
10 years ago
prabathabey 15d56e29c3 temporarily commenting out test cases till tenancy-test bits are properly added
10 years ago
geethkokila 8ab843e76c Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
10 years ago
milanperera 35ac8ec6c9 Fixed formating issues in PolicyManagerImpl
10 years ago
milanperera de6572d819 Fixed for JIRA MDM-372
10 years ago
geethkokila 9dc5a1e2e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 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
10 years ago
harshanl c2ef90d399 added class comments
10 years ago
harshanl 50640c9dfd Added tenant configuration persistance
10 years ago
geethkokila 397fb7113e Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
10 years ago
milanperera 7313ba1e7e Implemented policy monitoring add operation
10 years ago
prabathabey 7d089d8b09 Removing IDE warnings
10 years ago
prabathabey a461e887d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 87e632866b Fixing connection leaks spotted in operation management implementation
10 years ago
harshanl 00b9303283 Fixed the issue with java package name
10 years ago
geethkokila c4739efd0e Fixing the policy monitoring service adding
10 years ago
geethkokila 9ca5815ec3 Fixing the saving issues
10 years ago
harshanl 57299063b3 Added policy configuration to the cdm-config
10 years ago
geethkokila e0301e4ce3 Adding the 90% completed monitoring task
10 years ago
manoj 4049d1a2b4 Remove properties from config operations
10 years ago
geethkokila 38939d6c7b Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
10 years ago
prabathabey ff2c29a158 Registering license managment service
10 years ago
manoj ac3438e2cd Code refactor application update
10 years ago
milanperera 05fd385d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj f8c1cbc405 change generated keys to prepared statement constant
10 years ago
manoj b0a55a55c8 code clean up
10 years ago
milanperera f14ba29d30 Merged
10 years ago
milanperera 854b7dda8d Merged
10 years ago
manoj a6cee6bae3 change update operation response to object
10 years ago
manoj 3bbbed40e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
manoj 25a8f60d74 Retuen int for operations
10 years ago
kasundananjaya 2d1433a2f0 Merge pull request #16 from milanperera/master
10 years ago
manoj 27279426f0 code clean up
10 years ago
manoj 00819fe4b6 Unit tests, application update
10 years ago
manoj de17217303 Unit tests, application update
10 years ago
milanperera a82351f53f Refactered getDevicesByType query
10 years ago