Commit Graph

938 Commits (2a6db0cdc4775901fe44cd0532e67ae1e33425f8)

Author SHA1 Message Date
milanperera df61f9263a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
milanperera 9fcea34d73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
milanperera c0b0975929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
milanperera 63721cb79d Refactored
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
milanperera f0ec3dbe4c Fixed NPE issues in policy-mgt
9 years ago
prabathabey b298407160 Fixing improper parent configurations found in apimgt.extensions component and feature
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
prabathabey bfa1ea1875 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
milanperera 5b2e0c8989 Merged
9 years ago
geethkokila fde54d2d32 Fixing the monitoring service
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
geethkokila fcb7530d3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 2769392bc0 Fixing the monitoring task for not to notify the blocked and inactive devices
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 8ab843e76c Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
9 years ago
milanperera 35ac8ec6c9 Fixed formating issues in PolicyManagerImpl
9 years ago
milanperera de6572d819 Fixed for JIRA MDM-372
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
geethkokila 397fb7113e Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
9 years ago
milanperera 7313ba1e7e Implemented policy monitoring add operation
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 00b9303283 Fixed the issue with java package name
9 years ago
geethkokila c4739efd0e Fixing the policy monitoring service adding
9 years ago
geethkokila 9ca5815ec3 Fixing the saving issues
9 years ago
harshanl 57299063b3 Added policy configuration to the cdm-config
9 years ago
geethkokila e0301e4ce3 Adding the 90% completed monitoring task
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
milanperera eeca0d4ded Refactored DCA
9 years ago
milanperera 1d18c6de1e Refactored DCA
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
geethkokila d048913e06 Adding the momitoring task partialy
9 years ago
prabathabey a886430005 Initializing Device Management providers
9 years ago
prabathabey fd6793a9af Fixing device management API structure
9 years ago
prabathabey 8073d46f58 Cleaning up Dynamic Client Registration implementation
9 years ago
prabathabey 85aec417e5 Setting target version of maven compiler plugin to 1.7
9 years ago
mharindu 52b4902aa5 Refactored dynamic-client-registration unregister function
9 years ago
prabathabey 2dc1c7341a Improving the current dynamic client authentication to be more spec compliant
9 years ago
mharindu 440194632c Implemented dynamic-client-authentication unregister function
9 years ago
manoj 0e2e0fdd0e Remove package attribute form Application
9 years ago
Dilshan Edirisuriya 3908705b68 Null check
9 years ago
prabathabey d5119aba56 Fixing more issues in poms
9 years ago
prabathabey aaa3e49956 dynamic-client-manager/pom.xml
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
9 years ago
prabathabey 043440eb76 Fixing an invalid table name used in getDevices() method
9 years ago
manoj 286a04dd31 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj cc5dd3baa6 Move add application list, get applist methods to applicationServiceProvider
9 years ago
geethkokila 8bc7c5824a Fixing test case failures and device dao errors
9 years ago
geethkokila e0dd398b27 Fixing build failiures
9 years ago
geethkokila 8f9259f346 Doing a patial commit
9 years ago
manoj 66afd0be4b Change updateApplicationList method
9 years ago
manoj a8ae030fe7 Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins
9 years ago
geethkokila 714ddc51a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 3c73bba40c Commiting ppartialy to get updates
9 years ago
prabathabey 431c86ae0e Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console
9 years ago
geethkokila 524ce44036 Merge branch 'master' of https://github.com/wso1/carbon-device-mgt
9 years ago
geethkokila 2e89722883 Fixing the monitoring dao
9 years ago
prabathabey 7a6e947810 Making Device object return enrolment data too
9 years ago
prabathabey 974a616737 DAO refactoring
9 years ago
prabathabey 8d348a358c Committing initial version of supporting device life cycle management
9 years ago
harshanl 952db0183d Moved updateApplicationListOfDevice method to DeviceMgtService
9 years ago
Dilshan Edirisuriya 8c59d82708 Making serializable
9 years ago
harshanl 20a9d1222f Added a method to retrieve list of applications installed on a device
9 years ago
geethkokila e4d156a77e Adding policy monitoring to core, this is only having the monitoring daos and manager class and exceptions
9 years ago
manoj d30048d94d change properties
9 years ago
manoj 65b1ea70ab Add properties to store mobile app specific meta data
9 years ago
manoj 567f78abb6 Add additional fields to load device
9 years ago
prabathabey d28de90679 Fixing an invalid database table name used in DeviceDAOImpl
9 years ago
manoj f3dd402e4b Set device status to active when poll operations
9 years ago
manoj 6263a550ff Set device enrolment status
9 years ago
manoj 65620a7389 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 83698e7a99 AppList update for device
9 years ago
manoj 1aa22b29c5 AppList update for device
9 years ago
manoj 4510a954a5 AppList update for device
9 years ago
prabathabey 1dd9134e5d Fixing poms to remove device.mgt.user.* dependencies
9 years ago
prabathabey 22bf894d45 Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository
9 years ago
manoj 78ee8e334f Remove app list update method from app manager interface
9 years ago
manoj 6f2c51ee36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 82cbbef83b Application list saving method and device operation response saving
9 years ago
prabathabey 60ee259b2b Fixing DeviceDAOs to associate tenant id to filter out tenant specific resources
9 years ago
manoj 0e18ebcf4e Synchronize plugin register
9 years ago
manoj aa8de8cb23 Add all registerd devices to newly registerd plugin listner
9 years ago
manoj 7497a1d033 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 856fea3455 fix instansiating of device provider serviceImpl with empty plugin repo
9 years ago
prabathabey c0cbc59a03 Code cleanup
9 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
9 years ago
prabathabey 2526d87c21 Introducing a separate bean to carry all enrolment data
9 years ago
prabathabey 60960d80b4 More code cleanups
9 years ago
geethkokila 549e4a784c Fixing issues
9 years ago
prabathabey c13975191e Code cleanup
9 years ago
prabathabey 67c3c7f9a5 Fixing issues in handling requests that are not bound to an appropriate authenticator type
9 years ago
Geeth 89262ef1d4 Merge pull request #14 from milanperera/master
9 years ago
manoj 0de6ff09e7 Change get device by name query
9 years ago
manoj 21ea3a4428 change device type query
9 years ago
manoj 651cfdc6cb Check if pending operations empty
9 years ago
manoj 61ebf6beb4 Remove status field from get next operations query
9 years ago
manoj 6a1cf1b3f8 Remove status field from get next operations query
9 years ago
mharindu 29b58576f8 Fixed an issue in policy based on ownership type
9 years ago
mharindu 1ed6eec02f Fixed bugs in policy
9 years ago
mharindu 6586eb028c Merged
9 years ago
mharindu 16cc17369c Refactored DCA
9 years ago
geethkokila 009c9dd6df Fixing the user based policies
9 years ago
geethkokila f7abe86e3c Fixing the user based policies
9 years ago
Dulitha Wijewantha 34a8641582 * Added update device implementation
9 years ago
manoj 707a8c9709 Add payload to policy operation
9 years ago
manoj 05a3244040 Add payload to policy operation
9 years ago
manoj 0f7df72167 Cast to operation type in dto convertion
9 years ago
manoj 245d3706a2 Invoke policy operation dao
9 years ago
manoj e948075bc5 Invoke policy operation dao
9 years ago
manoj 6188878340 Add operation code for policy operation
9 years ago
manoj a4e6b02e60 Add operation type for policy operation
9 years ago
manoj 8a03c7a368 Add policy operation for effective policy
9 years ago
manoj 14c6773b57 Fetch device according to the device identifier
9 years ago
manoj 39b85a3b44 update operation status
9 years ago
manoj 0ed9c46a64 set operation status
9 years ago
manoj f68c7133cf Check null before close connection
9 years ago
manoj 3dcb42ee64 fix connection close issue while call super getOperation method inside loop
9 years ago
manoj 9f592f8a33 fix operation id field issue
9 years ago
manoj 3c99c9ec2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 7fb3a594b8 Instansiate Policy DAO in operations dao factory
9 years ago
prabathabey 6c6f644892 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey de9b17f41f Modifying Device bean definition
9 years ago
manoj f8fbbdb467 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj d15f19dab2 correct sql ambiguos selection of operation id
9 years ago
prabathabey cdcba23021 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 72e940b523 Code cleanup
9 years ago
manoj e2ef2504a9 Y
9 years ago
prabathabey d444f4ce0c Adding an interface method to DeviceManager.java to support claimable devices
9 years ago
manoj 54c776000f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-1.0.0
9 years ago
manoj c3805364c9 Refractor Operations to handle Policy Operations and remove joins
9 years ago
manoj 917c0cf965 Refractor Operations to handle Policy Operations and remove joins
9 years ago
prabathabey a3e385bd2f Serializing the complete OAuthAPplicationInfo bean
9 years ago
prabathabey 4e17a2669f Fixing more dynamic authentication related issues
9 years ago
prabathabey e909ac8bcc Fixing issues prompted due to not properly inheriting JAX-RS annotations
9 years ago
prabathabey ef12414210 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey cc3f543768 Fixing dyanamic client registration related issues
9 years ago
mharindu 3d549701a4 Fixed query issue in function getDevicesByName
9 years ago
mharindu 3db38b7e17 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 68cefe21a5 Fixing issues encountered in dynamic client authentication implementation
9 years ago
mharindu fd0a978eb5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu de8914fdcb Added a function to retrieve device list from device name
9 years ago
prabathabey e21c92a1ce Code cleanup
9 years ago
prabathabey 6cdd122c97 Adding the initial implementation of dynamic client registration
9 years ago
prabathabey 3c5a3adc2f Fixing failures prompted while invoking APIs that are OAuth protected
9 years ago
manoj 8ee09793f2 Change Bearer regex pattern
9 years ago
manoj ca4f902185 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj eda34cf4de Change logic of token extraction
9 years ago
geethkokila 535c4e4717 Fixing policy deletion
9 years ago
manoj 54290e0ab3 Change OAuthAutheticator to get api version and context
9 years ago
manoj f2c33f9421 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj cfe9bd5f9f Email format
9 years ago
geethkokila 5cd63c1c88 Fixing policy count
9 years ago
geethkokila 5a4d2e20a4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 30b01fc3bc Fixing the sort issue
9 years ago
dilanua 851fb35554 Updated DeviceTypeDAOImpl.java
9 years ago
mharindu ffaccbe371 Refactored policy
9 years ago
manoj 48a2062f64 Add operations for effective policy
9 years ago
geethkokila 6e18b7c11a Adding the policy priority changing dao methods
9 years ago
mharindu 39ae880972 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 89d0fa0894 Implemented device count and policy count
9 years ago
geethkokila 29066134db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 302470ff8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj acdf6021a7 Policy related operations
9 years ago
manoj 85df7ca9a0 Policy related operations
9 years ago
geethkokila 3e37b73360 Removing unnessaccery code blocks
9 years ago
geethkokila 1f507e4224 Removing unneccessary catch exception
9 years ago
geethkokila e8255e45c6 Adding the user list to policies
9 years ago
mharindu ed9eebca52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 3382686d52 Fixing policies related issues, and adding the delete policy
9 years ago
mharindu 7b9dba545a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila a1f851243c Fixing null pointer issue
9 years ago
geethkokila 37b4e27c42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila e07d917ad6 Fixing bugs
9 years ago
mharindu 5c1cff9bb8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 486d39e54d Fixing authentication issues surfaced due to not properly configuring WebappAuthenticatorRepository
9 years ago
mharindu 1c4e74f706 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
mharindu 695ff8edcb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey cdcb7d2546 Fixing build failures
10 years ago
prabathabey abf1e3d2ea Fixing build failures
10 years ago
prabathabey 7942fb4cbb Fixing issues surfaced when a proper authentication scheme is not defined for certain resources
10 years ago
mharindu 6e11c8e112 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila a9d3d15438 Adding pofile operations
10 years ago
mharindu 1904264c0d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila 0638ec2357 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
geethkokila 548ce6873f Changing the get effective policy method to store the policy as a operation, and adding ownership type to the policy database
10 years ago
mharindu 30edad0529 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
Dulitha Wijewantha 341abb47ab Fixes to the timestamp and filters
10 years ago
prabathabey c8affcf836 Improving the way webapp requests are authenticated
10 years ago
mharindu 3d69503e96 Merged
10 years ago
geethkokila 4a4349382a Adding the user core changes
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 d0819adf6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
mharindu 40feabb9df Fixed bug in device disenrollment
10 years ago
geethkokila 1d180c1a1e Adding the policy related new tables
10 years ago