community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,111 Commits 31 Branches 461 Tags 183 MiB
00a16ea2bc
Commit Graph

1126 Commits

Author SHA1 Message Date
inosh-perera
4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI 2015-11-10 17:36:30 +05:30
harshanl
c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 18:59:26 +05:30
harshanl
74a3b0e346 Fixed EMM-910 2015-11-03 18:58:52 +05:30
geethkokila
30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url 2015-11-03 16:24:49 +05:30
geethkokila
2479be9f5a Fixing the email client issue 2015-11-02 19:37:21 +05:30
Kasun Delgolla
c00b1ee713 Committing fix for JIRA- EMM-860 2015-10-29 20:46:48 +05:30
prabathabey
90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts 2015-10-29 14:11:24 +05:30
harshanl
8a1dba166a Updated FeatureMgr spec 2015-10-28 22:09:01 +05:30
harshanl
340a690995 Added sql script 2015-10-20 10:11:42 +05:30
harshanl
1d4bba9807 License issue fixed 2015-10-20 08:12:02 +05:30
harshanl
09fbf9e8a1 Fixed DAO issues 2015-10-19 22:45:39 +05:30
harshanl
89e930d530 Fixed isssues in pagination 2015-10-18 21:56:13 +05:30
harshanl
25d7459974 Pagination changes 2015-10-18 20:50:39 +05:30
harshanl
155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:54:35 +05:30
prabathabey
a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:18:26 +05:30
prabathabey
c74e27102f Fixing issues in adding license configs 2015-10-18 18:16:52 +05:30
harshanl
81b6770c08 Fixed oauth issue with tenants 2015-10-18 01:44:28 +05:30
harshanl
6c196d5317 Added pagination support 2015-10-16 23:40:13 +05:30
harshanl
9a68aa92bc Removed the use of web-app context in permission.xml of webapps 2015-10-14 22:33:36 +05:30
harshanl
d4eab9f86e Code refactored. 2015-10-12 19:48:35 +05:30
harshanl
429b738dba Fixed issues in permission tree' 2015-10-06 22:41:59 +05:30
harshanl
77f5f466d6 Added scope validator and refactored code 2015-10-06 11:44:40 +05:30
harshanl
648d8ec209 Added OAuth scope validator & fixed DataHolders 2015-10-05 11:28:47 +05:30
harshanl
234cd47931 Added identity-extensions 2015-10-02 18:00:05 +05:30
milanperera
e408d50037 Refactored permission module 2015-10-02 17:07:57 +05:30
milanperera
a0187b905b Removed unneccessary imports and code segments 2015-10-02 16:57:42 +05:30
milanperera
a84edd7a99 Added seperate permission tree class 2015-10-02 16:40:52 +05:30
milanperera
02ad7fb8e1 Refactored authorization module 2015-10-02 16:40:13 +05:30
milanperera
ed937467cd Refactored permission authorizer module 2015-10-01 17:35:08 +05:30
milanperera
68befaae01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-01 12:14:28 +05:30
milanperera
1034eb85c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-28 16:55:50 +05:30
mharindu
0a321e279a Added null check to getLicense 2015-09-24 14:37:52 +05:30
Dilshan Edirisuriya
9ce1c2002a Null check in DAO 2015-09-22 14:09:59 +05:30
milanperera
126c2ec371 Implemented permission authorizing module 2015-09-17 11:09:31 +05:30
milanperera
47ac0b1146 Fixed conflicts and merged local changes 2015-09-15 10:22:53 +05:30
Dilshan Edirisuriya
ac5a7f4ab1 Null check in JWT authenticator and fixing tenant id issue in device DAO 2015-09-14 17:12:07 +05:30
milanperera
37854a2cef Partial Commit 2015-09-14 15:51:23 +05:30
Dilshan Edirisuriya
5f2ec88300 Changes in certificate managment 2015-09-14 15:28:28 +05:30
Dilshan Edirisuriya
3907c0fba2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-14 15:23:18 +05:30
Dilshan Edirisuriya
4a03c7abf7 certificate authentication changes 2015-09-14 15:23:11 +05:30
harshanl
b8720917e1 Added Dynamic-client-registration module 2015-09-11 20:53:19 +05:30
milanperera
517039cccb Partial commit 2015-09-10 11:20:29 +05:30
mharindu
2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-08 11:16:41 +05:30
harshanl
bf0e95fa6c Fixed notification service issues 2015-09-07 18:14:20 +05:30
harshanl
330f059a09 Added App-Mgt config testcases 2015-09-05 01:26:52 +05:30
mharindu
3421663724 Fixed conflics and merged 2015-09-04 11:15:59 +05:30
geethkokila
4500aacd38 Adding the scep support for getting the device tenant id 2015-09-03 23:38:27 +05:30
mharindu
0e7ff3c0c8 Merged 2015-09-03 20:40:49 +05:30
hasuniea
581c4f013b refactored changes 2015-09-03 20:19:28 +05:30
mharindu
069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 12:03:41 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
mharindu
cbf10a8b59 Refactored addOperation method 2015-09-02 17:35:41 +05:30
hasuniea
7642112a9f code clean up 2015-09-02 17:27:28 +05:30
mharindu
0c43338f5d Added runtime exception to DCA 2015-09-02 16:16:18 +05:30
mharindu
1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:34:11 +05:30
geethkokila
5ee8c0f065 Fixing the cache manager issues 2015-09-02 14:47:36 +05:30
hasuniea
9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 14:26:15 +05:30
mharindu
725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 18:20:09 +05:30
geethkokila
f2b8f978f5 Fixing the operations connection close problems 2015-09-01 18:15:02 +05:30
mharindu
cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 17:20:12 +05:30
geethkokila
b14461a5af Fixing the datasource issue in the device magt core 2015-09-01 17:16:51 +05:30
mharindu
ad5335c9f5 Fixed local conflicts and merged 2015-09-01 15:29:24 +05:30
mharindu
6385c13012 Fixed issues in DeviceDAO 2015-09-01 15:25:16 +05:30
prabathabey
2b6bf203e2 Resolving conflicts observed in policy management implementation 2015-09-01 15:06:41 +05:30
mharindu
fd29deb372 Fixed conflicts of local repo and merged 2015-09-01 12:57:13 +05:30
prabathabey
892b9681f5 Fixing transaction handling issues 2015-09-01 12:51:18 +05:30
geethkokila
458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases 2015-08-31 19:31:13 +05:30
geethkokila
c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 17:13:42 +05:30
harshanl
20873e7786 Added null checks 2015-08-31 14:37:44 +05:30
geethkokila
c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task 2015-08-30 21:45:56 +05:30
Your Name
b906d43cc8 Committing tenant configuration manager service 2015-08-29 22:14:07 +05:30
geethkokila
bcb2c1ddb1 Commiting the monitoring changes and test case changes 2015-08-29 17:39:07 +05:30
geethkokila
44b496d350 Partially commiting due to update 2015-08-28 12:33:10 +05:30
hasuniea
7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:22:07 +05:30
mharindu
69cf3f8939 Cleaned code and added comments 2015-08-27 17:15:37 +05:30
mharindu
abc16557dc Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:45:10 +05:30
mharindu
460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:43:52 +05:30
harshanl
aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps 2015-08-26 18:20:37 +05:30
mharindu
8c748b3dfd Removed unnecessary comments 2015-08-26 17:45:21 +05:30
hasuniea
9f6dd55223 fixed issue in modify enrollment 2015-08-26 14:05:21 +05:30
harshanl
1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-25 09:47:11 +05:30
prabathabey
3582973f84 Code cleanup 2015-08-24 11:04:47 +05:30
prabathabey
d4c5d9023e Adding necessary instructions for transaction handling 2015-08-24 11:04:28 +05:30
prabathabey
de2c378214 Code cleanup 2015-08-24 10:15:50 +05:30
harshanl
423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:05:24 +05:30
prabathabey
ce0cc1699f Fixing more transaction handling related issues 2015-08-23 20:19:20 +05:30
prabathabey
cdbdc86f42 Fixing transactional anomalies and code cleanup 2015-08-22 03:56:44 +05:30
harshanl
076d60ec83 PermissionManager changes 2015-08-22 03:01:20 +05:30
prabathabey
d7e363cef7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-22 01:51:56 +05:30
prabathabey
00807e8295 Fixing transaction anomalies and code clean up 2015-08-22 01:51:42 +05:30
Prabath Abeysekara
a5c9886c63 Merge pull request #25 from milanperera/master 
Fixed "204 Content Not Found" issue in LicenseManager
 2015-08-22 00:51:12 +05:30
mharindu
f36c82b059 Refactored LicenseManager 2015-08-22 00:47:17 +05:30
mharindu
4709107719 Refactored LicenseManager 2015-08-22 00:31:18 +05:30
mharindu
8949992148 Fixed 204 issue in LicenseManager 2015-08-22 00:12:24 +05:30
Dilshan Edirisuriya
3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
Conflicts:
	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
 2015-08-21 14:53:36 +05:30
dilanua
4e5a38998d Updating DAO Layer 2015-08-07 22:09:51 +05:30
dilanua
df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus 2015-08-07 18:13:42 +05:30
geethkokila
149b743a2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-07 12:27:43 +05:30
harshanl
58c45c92be Fixed tenant configuration persisting issue 2015-08-06 18:11:40 +05:30
geethkokila
c039adf4ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-03 18:21:10 +05:30
prabathabey
c41f6c3002 Code cleanup 2015-08-03 17:22:46 +05:30
geethkokila
3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 23:32:12 +05:30
milanperera
e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp) 2015-07-30 18:34:56 +05:30
milanperera
508082808c Fixed a bug in commons.licence 2015-07-30 17:10:12 +05:30
prabathabey
84bc22f9f3 Setting default values for fields validFrom and validTo 2015-07-30 16:56:45 +05:30
prabathabey
536e13b0a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 15:17:03 +05:30
prabathabey
53302070e6 Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl 2015-07-30 15:16:12 +05:30
geethkokila
cb489c0174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-29 19:52:59 +05:30
Dilshan Edirisuriya
37763b7e40 Importing org.wso2.carbon.device.mgt.common 2015-07-29 11:43:45 +05:30
geethkokila
b8462b02ac Fixing the conflicts 2015-07-29 07:30:14 +05:30
prabathabey
c134cc7e25 Fixing license manager initialization related issues and code cleanup 2015-07-28 20:38:02 +05:30
prabathabey
ca38cc9f51 Removing URL printer start-up handler from device.mgt.core 2015-07-28 18:09:49 +05:30
prabathabey
c471017c40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-28 17:25:54 +05:30
prabathabey
134b4ae53c Code cleanup 2015-07-28 17:25:41 +05:30
Dilshan Edirisuriya
e7f02365a8 Importing axis2.transport.mail 2015-07-28 16:42:20 +05:30
prabathabey
54cd6b80f4 Fixing merge conflicts 2015-07-28 15:21:06 +05:30
prabathabey
955c119006 Adding policy delegation 2015-07-28 15:19:34 +05:30
geethkokila
dc205aa081 Fixing the conflicts 2015-07-27 20:32:12 +05:30
geethkokila
6d687364c6 Fixing the monitoring tasks 2015-07-27 12:27:12 +05:30
milanperera
256880089e Merged 2015-07-27 11:16:03 +05:30
prabathabey
1716c2c7f6 Making apimgt extensions module a separate component/feature pair 2015-07-25 12:41:18 +05:30
prabathabey
1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module 2015-07-24 19:22:14 +05:30
milanperera
5b2e0c8989 Merged 2015-07-24 12:32:26 +05:30
prabathabey
a68ca0cfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-24 12:08:12 +05:30
prabathabey
8394b63e0c Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions 2015-07-24 12:07:57 +05:30
milanperera
7ec10d670c Fixed bugs in device disenrolment 2015-07-23 17:32:05 +05:30
milanperera
5a8975d7ac Partial Commit 2015-07-23 16:55:54 +05:30
milanperera
35ce4be1a1 Partial Commit 2015-07-23 15:55:32 +05:30
Prabath Abeysekara
3512e3e60a Merge pull request #20 from milanperera/master 
Refactored SQL queries
 2015-07-23 14:50:57 +05:30
milanperera
6f56e27f1d Refactored SQL queries 2015-07-23 14:46:22 +05:30
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 2015-07-23 14:35:02 +05:30
geethkokila
bd75f70a24 Fixing the merge conflicts 2015-07-23 10:17:04 +05:30
geethkokila
6270dff93c Fixing priviledege carbon context issue in device-mgt component 2015-07-23 10:14:24 +05:30
prabathabey
d9459b09ba Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-23 10:02:02 +05:30
prabathabey
fac53e4814 Upgrading tomcat version usd in carbon-devicemgt 2015-07-23 10:01:56 +05:30
prabathabey
9e5e3cf73d Enforcing proxy port to be used when configured 2015-07-23 09:57:50 +05:30
prabathabey
e4fd0607e8 Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code 2015-07-22 23:43:12 +05:30
prabathabey
15d56e29c3 temporarily commenting out test cases till tenancy-test bits are properly added 2015-07-22 23:41:05 +05:30
geethkokila
9dc5a1e2e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-22 17:24:50 +05:30
geethkokila
aee2402d0d Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home 2015-07-22 17:24:33 +05:30
harshanl
c2ef90d399 added class comments 2015-07-22 15:47:25 +05:30
harshanl
50640c9dfd Added tenant configuration persistance 2015-07-22 15:36:16 +05:30
prabathabey
7d089d8b09 Removing IDE warnings 2015-07-21 19:13:16 +05:30
prabathabey
a461e887d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-21 19:12:34 +05:30
prabathabey
87e632866b Fixing connection leaks spotted in operation management implementation 2015-07-21 19:12:22 +05:30
harshanl
57299063b3 Added policy configuration to the cdm-config 2015-07-20 11:16:15 +05:30
manoj
4049d1a2b4 Remove properties from config operations 2015-07-20 09:39:38 +05:30
geethkokila
38939d6c7b Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master 2015-07-16 22:56:32 +05:30
prabathabey
ff2c29a158 Registering license managment service 2015-07-16 19:57:03 +05:30
manoj
ac3438e2cd Code refactor application update 2015-07-16 13:17:43 +05:30
milanperera
05fd385d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-16 12:11:23 +05:30
manoj
f8c1cbc405 change generated keys to prepared statement constant 2015-07-16 01:01:07 +05:30
manoj
b0a55a55c8 code clean up 2015-07-15 20:41:10 +05:30
milanperera
f14ba29d30 Merged 2015-07-15 13:57:32 +05:30
milanperera
854b7dda8d Merged 2015-07-15 13:56:21 +05:30
manoj
a6cee6bae3 change update operation response to object 2015-07-15 12:44:55 +05:30
manoj
3bbbed40e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-15 12:11:58 +05:30
manoj
25a8f60d74 Retuen int for operations 2015-07-15 12:11:00 +05:30
kasundananjaya
2d1433a2f0 Merge pull request #16 from milanperera/master 
Refactored dynamic-client-registration unregister function
 2015-07-15 12:05:29 +05:30
manoj
27279426f0 code clean up 2015-07-15 11:02:54 +05:30
manoj
00819fe4b6 Unit tests, application update 2015-07-15 07:38:13 +05:30
manoj
de17217303 Unit tests, application update 2015-07-15 07:37:20 +05:30
milanperera
a82351f53f Refactered getDevicesByType query 2015-07-14 20:31:37 +05:30
milanperera
a5a9d02dee Implemented getDeviceByStatus function 2015-07-14 19:39:03 +05:30
manoj
6daa71771c Unit tests for service layer 2015-07-14 17:12:45 +05:30
manoj
41d1408b14 Add application update and unit tests 2015-07-14 11:00:16 +05:30
manoj
da61c08fac Add application update and unit tests 2015-07-14 10:59:39 +05:30
mharindu
0a671373e5 Merged with local changes 2015-07-13 17:37:04 +05:30
mharindu
9d8c52958d Refactored SQL queries and added null checks 2015-07-13 17:24:45 +05:30
prabathabey
a886430005 Initializing Device Management providers 2015-07-09 22:17:22 +05:30
prabathabey
fd6793a9af Fixing device management API structure 2015-07-09 22:07:15 +05:30
manoj
0e2e0fdd0e Remove package attribute form Application 2015-07-08 14:18:04 +05:30
Dilshan Edirisuriya
3908705b68 Null check 2015-07-07 18:18:23 +05:30
geethkokila
388701c3a2 Adding partial commit to add a interface for plugins to implement to notify devices for monotoring 2015-07-07 11:54:24 +05:30
prabathabey
dea6d12173 Fixing more issues in SQL queries used in DeviceDAOImpl 2015-07-06 19:36:21 +05:30
prabathabey
043440eb76 Fixing an invalid table name used in getDevices() method 2015-07-06 18:59:57 +05:30
manoj
286a04dd31 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-06 18:15:54 +05:30
manoj
cc5dd3baa6 Move add application list, get applist methods to applicationServiceProvider 2015-07-06 18:15:04 +05:30
geethkokila
8bc7c5824a Fixing test case failures and device dao errors 2015-07-06 17:57:59 +05:30
manoj
66afd0be4b Change updateApplicationList method 2015-07-06 14:03:37 +05:30
manoj
a8ae030fe7 Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins 2015-07-06 13:20:34 +05:30
prabathabey
431c86ae0e Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console 2015-07-06 11:50:38 +05:30
prabathabey
7a6e947810 Making Device object return enrolment data too 2015-07-04 14:52:32 +05:30
prabathabey
974a616737 DAO refactoring 2015-07-04 14:24:35 +05:30
prabathabey
8d348a358c Committing initial version of supporting device life cycle management 2015-07-04 12:12:47 +05:30
harshanl
952db0183d Moved updateApplicationListOfDevice method to DeviceMgtService 2015-07-03 18:13:02 +05:30
Dilshan Edirisuriya
8c59d82708 Making serializable 2015-07-03 16:30:55 +05:30
harshanl
20a9d1222f Added a method to retrieve list of applications installed on a device 2015-07-03 14:35:26 +05:30
manoj
d30048d94d change properties 2015-07-03 11:43:59 +05:30
manoj
65b1ea70ab Add properties to store mobile app specific meta data 2015-07-02 18:07:35 +05:30
manoj
567f78abb6 Add additional fields to load device 2015-07-02 15:06:18 +05:30
prabathabey
d28de90679 Fixing an invalid database table name used in DeviceDAOImpl 2015-06-30 12:35:25 +05:30
manoj
f3dd402e4b Set device status to active when poll operations 2015-06-25 21:13:55 +05:30
manoj
6263a550ff Set device enrolment status 2015-06-25 20:25:08 +05:30
manoj
65620a7389 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-06-23 13:33:46 +05:30
manoj
83698e7a99 AppList update for device 2015-06-23 13:30:24 +05:30
manoj
1aa22b29c5 AppList update for device 2015-06-23 13:02:20 +05:30
manoj
4510a954a5 AppList update for device 2015-06-23 13:02:06 +05:30
prabathabey
1dd9134e5d Fixing poms to remove device.mgt.user.* dependencies 2015-06-23 01:06:16 +05:30
prabathabey
22bf894d45 Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository 2015-06-23 00:58:42 +05:30
manoj
78ee8e334f Remove app list update method from app manager interface 2015-06-22 22:03:23 +05:30
manoj
6f2c51ee36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-06-22 21:22:16 +05:30
manoj
82cbbef83b Application list saving method and device operation response saving 2015-06-22 21:21:50 +05:30
prabathabey
60ee259b2b Fixing DeviceDAOs to associate tenant id to filter out tenant specific resources 2015-06-22 20:36:31 +05:30
manoj
0e18ebcf4e Synchronize plugin register 2015-06-19 17:35:15 +05:30
manoj
aa8de8cb23 Add all registerd devices to newly registerd plugin listner 2015-06-19 14:23:32 +05:30
manoj
7497a1d033 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-06-19 11:38:25 +05:30
manoj
856fea3455 fix instansiating of device provider serviceImpl with empty plugin repo 2015-06-19 11:37:58 +05:30
prabathabey
c0cbc59a03 Code cleanup 2015-06-18 18:44:08 +05:30
prabathabey
a2dc916fd0 Fixing issues in plugin initialization as a result of certain plugins getting initialized after the device management component is done getting configured 2015-06-18 18:32:14 +05:30
prabathabey
2526d87c21 Introducing a separate bean to carry all enrolment data 2015-06-18 00:11:00 +05:30
prabathabey
60960d80b4 More code cleanups 2015-06-16 14:42:50 +05:30
prabathabey
c13975191e Code cleanup 2015-06-13 00:44:21 +05:30
manoj
0de6ff09e7 Change get device by name query 2015-06-09 16:37:52 +05:30
manoj
21ea3a4428 change device type query 2015-06-09 16:33:09 +05:30
manoj
651cfdc6cb Check if pending operations empty 2015-06-08 17:30:45 +05:30
manoj
61ebf6beb4 Remove status field from get next operations query 2015-06-08 15:41:28 +05:30
manoj
6a1cf1b3f8 Remove status field from get next operations query 2015-06-08 15:24:11 +05:30
Dulitha Wijewantha
34a8641582 * Added update device implementation 2015-05-30 22:11:43 +05:30
manoj
05a3244040 Add payload to policy operation 2015-05-30 02:16:50 +05:30
manoj
0f7df72167 Cast to operation type in dto convertion 2015-05-30 01:54:04 +05:30
manoj
245d3706a2 Invoke policy operation dao 2015-05-30 01:16:47 +05:30
manoj
e948075bc5 Invoke policy operation dao 2015-05-30 01:07:44 +05:30
manoj
6188878340 Add operation code for policy operation 2015-05-30 00:51:58 +05:30
manoj
a4e6b02e60 Add operation type for policy operation 2015-05-30 00:42:46 +05:30
manoj
14c6773b57 Fetch device according to the device identifier 2015-05-29 22:26:09 +05:30
manoj
39b85a3b44 update operation status 2015-05-29 21:58:15 +05:30
manoj
0ed9c46a64 set operation status 2015-05-29 20:07:24 +05:30
manoj
f68c7133cf Check null before close connection 2015-05-29 19:56:29 +05:30
manoj
3dcb42ee64 fix connection close issue while call super getOperation method inside loop 2015-05-29 19:40:06 +05:30
manoj
9f592f8a33 fix operation id field issue 2015-05-29 19:06:34 +05:30
manoj
3c99c9ec2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 18:24:59 +05:30
manoj
7fb3a594b8 Instansiate Policy DAO in operations dao factory 2015-05-29 18:23:42 +05:30
prabathabey
6c6f644892 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 17:57:59 +05:30
prabathabey
de9b17f41f Modifying Device bean definition 2015-05-29 17:57:45 +05:30
manoj
f8fbbdb467 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 17:51:19 +05:30
manoj
d15f19dab2 correct sql ambiguos selection of operation id 2015-05-29 17:38:19 +05:30
prabathabey
cdcba23021 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 17:30:47 +05:30
prabathabey
72e940b523 Code cleanup 2015-05-29 17:30:34 +05:30
manoj
e2ef2504a9 Y 
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
 2015-05-29 17:00:50 +05:30
prabathabey
d444f4ce0c Adding an interface method to DeviceManager.java to support claimable devices 2015-05-29 16:52:02 +05:30
manoj
54c776000f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-1.0.0 2015-05-29 15:54:51 +05:30
manoj
c3805364c9 Refractor Operations to handle Policy Operations and remove joins 2015-05-29 15:54:40 +05:30
manoj
917c0cf965 Refractor Operations to handle Policy Operations and remove joins 2015-05-29 15:54:15 +05:30
mharindu
3d549701a4 Fixed query issue in function getDevicesByName 2015-05-28 17:45:11 +05:30
mharindu
de8914fdcb Added a function to retrieve device list from device name 2015-05-28 14:55:34 +05:30
manoj
f2c33f9421 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-22 13:22:37 +05:30
manoj
cfe9bd5f9f Email format 2015-05-22 13:22:00 +05:30
dilanua
851fb35554 Updated DeviceTypeDAOImpl.java 2015-05-22 04:28:26 +05:30
mharindu
ffaccbe371 Refactored policy 2015-05-22 03:03:46 +05:30
manoj
48a2062f64 Add operations for effective policy 2015-05-22 02:32:04 +05:30
mharindu
39ae880972 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-22 01:23:17 +05:30
mharindu
89d0fa0894 Implemented device count and policy count 2015-05-22 01:23:03 +05:30
manoj
acdf6021a7 Policy related operations 2015-05-22 01:19:27 +05:30
manoj
85df7ca9a0 Policy related operations 2015-05-22 01:18:44 +05:30
mharindu
3d69503e96 Merged 2015-05-20 14:25:17 +05:30
mharindu
048c175fda Fixed issue of get device info function 2015-05-19 19:08:24 +05:30
Milan Perera
c068ac88de Update DeviceManagementServiceImpl.java 2015-05-19 17:30:20 +05:30
Milan Perera
7d3bf84d9f Update DeviceManagementServiceProviderImpl.java 2015-05-19 17:26:24 +05:30
Milan Perera
8f00128ab1 Update DeviceManager.java 2015-05-19 17:22:36 +05:30
mharindu
40feabb9df Fixed bug in device disenrollment 2015-05-19 17:13:36 +05:30
mharindu
847eb073b9 Refactored device info 2015-05-19 15:43:15 +05:30
mharindu
ead4d3be69 Refactored device info 2015-05-19 11:19:41 +05:30
manoj
f25dc65b54 Refractor device mgt user core service 2015-05-18 19:30:16 +05:30
manoj
c918622cc6 Refractor Email service and change user server feature name 
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
 2015-05-18 19:27:41 +05:30
mharindu
6b84d65e29 Refactored updateDeviceInfo function 2015-05-18 15:14:14 +05:30
manoj
6c80688af2 Remove app list from device info update service 2015-05-18 15:02:18 +05:30
mharindu
0f3a981367 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 11:14:11 +05:30
manoj
2d5d0bb4f8 Install APP service 2015-05-18 02:52:38 +05:30
manoj
94fbb56f06 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 02:31:15 +05:30
manoj
3589804ede Installation APP service 2015-05-18 02:31:10 +05:30
harshanl
db2065435b Added getAllDevicesOfUser and getAllDevicesOfRole methods with user feature 2015-05-17 17:56:44 +05:30
mharindu
c892c0b783 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-15 15:12:18 +05:30
manoj
1b1b66fc29 Handle DB close within rollback transaction 2015-05-15 15:04:13 +05:30
manoj
f4b8e4bb74 Remove delete device type from DB when un register plugin 2015-05-15 12:04:01 +05:30
mharindu
aeb9c6e5aa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-15 11:49:08 +05:30
manoj
a774bc89aa Device Type not present in DB, return null instead of dummy object 2015-05-15 02:43:41 +05:30
mharindu
937530087d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-14 22:14:07 +05:30
mharindu
f83897708c Merged 2015-05-14 22:13:57 +05:30
manoj
bf62561b00 Change Next operations method to accept parameter device id 2015-05-13 23:34:03 +05:30
manoj
9b5f6bc171 Change next operations to join profile operations 2015-05-13 18:25:52 +05:30
manoj
76c697453e Change platforms to lower case 2015-05-13 17:44:54 +05:30
manoj
3f78271847 Refractor application bean 2015-05-13 11:39:11 +05:30
manoj
58a7964b34 Refractor Application bean 2015-05-13 11:31:03 +05:30
manoj
3df761bba6 Refractor Application bean 2015-05-13 11:30:40 +05:30
manoj
696ab3554c Refractor Application bean 2015-05-13 11:30:26 +05:30
manoj
6c452433de Correct copy right text 2015-05-12 21:02:26 +05:30
manoj
9cf2d33c59 Correct copy right text 2015-05-12 21:00:16 +05:30
Prabath Abeysekara
00e8076a9d Merge pull request #7 from milanperera/master 
Fixed a bug in update Operation
 2015-05-12 19:33:45 +05:30
geethkokila
73b185e1e6 Removing feature implementation from the policy, adding criteria based policy 2015-05-12 16:20:18 +05:30
manoj
60f50a9242 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-11 12:32:37 +05:30
manoj
3a7c4b77b8 APP Manager Integration 2015-05-11 12:31:12 +05:30
manoj
2ae89bef59 APP Manager Integration 2015-05-11 12:30:07 +05:30
Milan Perera
d86a5ccc4a Fixed a bug in update Operation 2015-05-08 18:15:12 +05:30
Milan Perera
47183e12f2 Update ConfigOperation.java 2015-04-30 12:05:26 +05:30
mharindu
3dda515add Fixed a bug in add operation function 2015-04-30 11:01:38 +05:30
manoj
2d5f8fe937 Refractor Operations Mgt 2015-04-28 17:57:06 +05:30
manoj
5a4e4ec4a0 Operations Refractor 2015-04-28 14:42:59 +05:30
manoj
4f4240f176 Operations Refractor 2015-04-24 12:53:07 +05:30
manoj
d0b553d26a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-24 12:34:20 +05:30
manoj
a46aff84fd fetch command operation enable property 2015-04-24 12:34:04 +05:30
DilanUA
aabe9afff5 Updated back-end email notification functionality 2015-04-21 15:14:48 +05:30
manoj
42c368934b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-21 15:00:23 +05:30
manoj
bc10bf9257 Fix operations sql changing column names operation details 2015-04-21 14:59:29 +05:30
Dulitha Wijewantha
f558357c2a Fixed syntax issues due to spacing 2015-04-21 13:33:32 +05:30
DilanUA
625ad6d1dc Fixed some possible NPE issues in DeviceManagementServiceProviderImpl.java 2015-04-20 20:58:19 +05:30
manoj
79444e951a Change User registration mail 2015-04-20 18:06:38 +05:30
manoj
382b876f7f User Registration email 2015-04-17 20:11:24 +05:30
manoj
d81ca8c194 User registration email 2015-04-17 19:13:18 +05:30
manoj
20463cca57 User registration email configurations 2015-04-17 19:13:00 +05:30
manoj
932cb003da Refactor operations 2015-04-17 07:43:42 +05:30
manoj
4aac14b3d1 Refactor Operations 2015-04-15 21:41:09 +05:30
manoj
41edb530bc Refactor Operations 2015-04-15 21:40:13 +05:30
manoj
21782b0714 Check operation status as pending for next operations 2015-04-08 20:49:23 +05:30
manoj
32db7a1011 Check operation status as pending for next operations 2015-04-08 20:49:11 +05:30
manoj
2e051d8df5 Refactor operations mgt connection handling 2015-04-08 20:27:16 +05:30
Dilshan Edirisuriya
8daf620b0c Setting payload method refactoring 2015-04-08 19:47:00 +05:30
manoj
749f2b782e Change blob read method 2015-04-08 17:30:06 +05:30
manoj
45d6c08773 Remove connection from thread local at close 2015-04-08 16:37:51 +05:30
manoj
8e4c181446 Get profile operations from nect operations method 2015-04-08 16:25:49 +05:30
manoj
f93d710d8e For operation is profile operation get Next operations from profile operation DAO 2015-04-08 15:37:40 +05:30
manoj
eb500658f2 Move payload property to operation object 2015-04-08 13:27:35 +05:30
manoj
1c80fcd124 Remove paylooad property from Operation 2015-04-08 13:01:43 +05:30
manoj
0f55d86b08 Update Operations Begin transactions before update DB 2015-04-07 19:37:20 +05:30
manoj
fc5be1d059 Update operation rollback and commit 2015-04-07 19:15:03 +05:30
manoj
416ef5a745 Update Operation manager implementation 2015-04-07 19:07:21 +05:30
manoj
4a9a27ab7e Refactor operation DAO methods.Add connection close util method 2015-04-07 15:34:10 +05:30
manoj
32b86c7ff1 ADD Operation Code to core operation table 2015-04-06 19:23:26 +05:30
manoj
cf247128b3 init operation mgt data connection 2015-04-06 18:01:57 +05:30
manoj
a32e811183 Update operation DAO implementation 2015-04-06 17:17:20 +05:30
manoj
71713d4baf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-06 17:07:51 +05:30
manoj
465f421aa8 Update operation method DAO implementation 2015-04-06 17:07:38 +05:30
prabathabey
bf88170668 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-06 14:50:12 +05:30
prabathabey
97a303e495 Temporarily disabling schema enforcement upon reading configuration files 2015-04-06 14:49:54 +05:30
manoj
4312d528dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-06 11:08:11 +05:30
manoj
a4b83a4737 Implement operation DAO get next operation method 2015-04-06 11:07:57 +05:30
prabathabey
7b99fb5f9d Adding simple policy processing engine implementation together with some oauth extension implementation to support dynamic client authentication 2015-04-03 20:57:51 +05:30
prabathabey
93b88828cc Refactoring Device management related configuration file intialization process to associate appropriate schemas corresponding to each of the said configs 2015-04-03 20:32:15 +05:30
manoj
85b1d4c7d1 Add payload type to profile operation table 2015-04-02 19:25:45 +05:30
manoj
0267c8cb1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-02 11:20:25 +05:30
manoj
80bf3640f6 Change operation status to varchar 2015-04-02 11:19:03 +05:30
Dilshan Edirisuriya
52b48f3223 Reading from enum 2015-04-01 19:32:25 +05:30
Dilshan Edirisuriya
4198764cb2 Implementing services 2015-04-01 19:23:04 +05:30
manoj
e1b2e40847 Set profile operation DAO for profile operations 2015-04-01 18:54:32 +05:30
manoj
7cf5460fe6 Set profile operation DAO for profile operations 2015-04-01 18:54:09 +05:30
prabathabey
befb9cc711 Extending operation management implementation to support getPendingOperations() and getOperations() functionalities 2015-03-31 16:59:02 +05:30
prabathabey
0583695338 Fixing improper API name getting displayed when an API is republished 2015-03-31 13:11:38 +05:30
prabathabey
36dea72e02 Fixing API publishing related issues 2015-03-31 11:53:33 +05:30
prabathabey
5d02746a5e Fixing API publishing related issues 2015-03-30 20:45:34 +05:30
prabathabey
2b26ad08c2 Adding an info log to indicate the success of publishing a given API 2015-03-30 19:28:26 +05:30
prabathabey
add470c483 Fixing AppManager connector initialization issue at server start up and adding support for retrieving the complete operation list for a given device 2015-03-30 12:26:29 +05:30
prabathabey
5f7e4306de Adding support to retrieve the next available operation to be installed 2015-03-30 11:10:07 +05:30
prabathabey
e6d74ac9b4 Cleaning up app manager connector implementation 2015-03-29 13:01:07 +05:30
prabathabey
14e7be6146 Extending operation management functionality to support Profile operations 2015-03-28 20:00:49 +05:30
prabathabey
365d5a4c73 Committing changes to Operation bean 2015-03-28 19:57:14 +05:30
harshanL
a6363348b5 Fixed getFeatureManager method 2015-03-27 22:58:19 +05:30
prabathabey
1f587bddf8 Code cleanup 2015-03-27 17:59:12 +05:30
prabathabey
8ac5cb47a7 Code cleanup 2015-03-27 17:13:25 +05:30
prabathabey
103a83d425 Adding the remaining interface methods that are required to support the complete set of operation management related tasks 2015-03-27 13:24:20 +05:30
prabathabey
0d5c80c80b More code cleanups 2015-03-27 13:12:27 +05:30
prabathabey
98e1d5b1ec Mode code cleanups 2015-03-27 13:09:15 +05:30
prabathabey
92198a40c0 More code cleanups 2015-03-27 13:02:41 +05:30
prabathabey
1a1700d219 Code cleanup 2015-03-27 12:56:21 +05:30
manoj
9a1ffa6ab7 Add listner to Data source service 2015-03-27 00:11:21 +05:30
manoj
105bc2c6cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-26 22:28:54 +05:30
manoj
bee82d40e2 Add payload parameter to update operation 2015-03-26 22:28:14 +05:30
prabathabey
dd03eafe9d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-26 20:35:52 +05:30
prabathabey
8f83027e74 Making plugin registration deferred till the core completely registered 2015-03-26 20:35:32 +05:30
manoj
9b665eaddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-26 20:32:41 +05:30
manoj
e3acecd5a0 Create databases for plugins 2015-03-26 20:32:04 +05:30
inosh-perera
2002c92032 adding existing API check before publishing 2015-03-26 19:40:00 +05:30
manoj
7e0f4a4b2f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-26 19:22:00 +05:30
prabathabey
a0571dd310 Fixing API endpoint not getting properly added when the APIs are registered 2015-03-26 17:30:29 +05:30
manoj
ab08b835f4 Create plugin level databases 2015-03-26 17:20:52 +05:30
prabathabey
7c39871feb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-25 20:29:27 +05:30
prabathabey
2cef474281 Adding deactivate method into the service component 2015-03-25 20:29:23 +05:30
inosh-perera
504099a2c4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-25 20:04:22 +05:30
inosh-perera
4a061e7be2 adding App management integeration related code 2015-03-25 20:03:06 +05:30
prabathabey
bcc1cad6e5 Merging Webapp authenticator framework implementation 2015-03-25 18:46:17 +05:30
prabathabey
3070488adf Fixing Pom issues 2015-03-24 18:28:56 +05:30
manoj
fee9fbad7d Refactor Email Functionality 2015-03-24 18:15:45 +05:30
manoj
55d57f6577 Refactor email functionality 2015-03-24 17:57:58 +05:30
manoj
ee6c067398 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-24 17:49:53 +05:30
Dulitha Wijewantha
6d7f6767b5 * Implemented the OperationManager’s mapping of device and operation 
* Change method signature of OperationMappingDAO.addOperationMapping to support a list of device id integers
* Removed h2.sql and added them to CreateH2TestDB.sql in the test resources
* Cleaned up the DeviceManagementBaseTest class
 2015-03-24 09:36:42 +05:30
manoj
d7aa86cc0b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-23 20:52:54 +05:30
manoj
3e51415a64 Refactor Email functionality 2015-03-23 20:52:28 +05:30
manoj
03b4f41a2e Refactor Email functionality 2015-03-23 20:52:08 +05:30
prabathabey
c40af0de7a Moving API registration bits to device.mgt.core 2015-03-23 18:18:37 +05:30
prabathabey
fc80514d74 Resolving merge conflicts 2015-03-23 12:19:07 +05:30
manoj
0a824d9644 Format enrol email message 2015-03-23 12:16:51 +05:30
prabathabey
d71ea209c2 Code cleanup 2015-03-23 12:16:34 +05:30
manoj
7dfd3f0dd2 Improve email message format 2015-03-20 20:30:49 +05:30
manoj
e6d0d3fd00 Email format 2015-03-20 20:00:21 +05:30
manoj
a458c71789 Email format 2015-03-20 19:50:07 +05:30
prabathabey
8b3d8b74bf Fixing more feature management related changes 2015-03-20 18:06:05 +05:30
prabathabey
80908bac1e Adding feature manager related changes 2015-03-20 17:50:56 +05:30
manoj
28a00cd21c Email functionality 2015-03-20 16:17:51 +05:30
manoj
7c0ca194a1 Email functionality 2015-03-20 16:16:57 +05:30
manoj
78959f0cfb user management 2015-03-20 14:21:04 +05:30
prabathabey
61073f0a4b Committing operation management improvements 2015-03-20 14:03:03 +05:30
prabathabey
0e598aad59 Improving operation management implementation 2015-03-20 13:49:37 +05:30
manoj
d790d343a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
 2015-03-20 12:32:50 +05:30
manoj
b2d8f3f7f5 Email Management 2015-03-20 12:28:50 +05:30
manoj
34ad4a63a2 Email management 2015-03-20 12:27:45 +05:30
Dulitha Wijewantha
fc86ccd86d * Setup the datasource for the operation manager dao factory 
* Implemented the get all devices and get devices for user
* Added support for tenant domain in get devices for user (This has to be added to all methods)
 2015-03-20 10:23:32 +05:30
Dulitha Wijewantha
4600968d60 * Re-added the method to convert a Device Property list to a Map 2015-03-19 11:17:18 +05:30
prabathabey
4638d25ff1 Code cleanup 2015-03-18 22:00:19 +05:30
manoj
58337a986d Email functionality 2015-03-18 19:23:21 +05:30
manoj
e7d165d3b9 Email sending 2015-03-18 19:20:41 +05:30
manoj
232ef4bd90 merge with master 2015-03-18 19:10:09 +05:30
manoj
a41c1421e9 User list 2015-03-18 18:55:56 +05:30
prabathabey
19fbc11642 Restructuring the sources 2015-03-18 16:25:34 +05:30
prabathabey
3219a7cc41 Restructuring source code to be able to make it more maintenable 2015-03-18 15:47:31 +05:30
prabathabey
7056b01d18 Fixing more build issues 2015-03-18 10:25:38 +05:30
prabathabey
d5127f6874 Code cleanup and fixing build failures 2015-03-17 21:04:25 +05:30
prabathabey
3fb61d9c8b Resolving more merge conflicts 2015-03-17 17:40:49 +05:30
prabathabey
8b5f491d69 Fixing merge conflicts 2015-03-17 17:37:11 +05:30
prabathabey
31b931537f Adding operation and license management implementations 2015-03-17 17:30:30 +05:30
prabathabey
8662eb36e4 Adding operation manager related changes 2015-03-17 17:27:41 +05:30
inosh-perera
4754da70be get all devices when the username is provided 2015-03-16 12:39:08 +05:30
Geeth Munasinghe
ac2fa547d4 [maven-release-plugin] prepare for next development iteration 2015-02-24 14:29:34 +05:30
Geeth Munasinghe
28a1bd9fde [maven-release-plugin] prepare release v0.9.1 2015-02-24 14:29:25 +05:30
Geeth Munasinghe
1a550269f1 Changing the version to 0.9.1-SNAPSHOT 2015-02-24 14:24:16 +05:30
Geeth Munasinghe
835207a13d [maven-release-plugin] prepare for next development iteration 2015-02-23 18:54:54 +05:30
Geeth Munasinghe
7933271193 [maven-release-plugin] prepare release v0.9.1 2015-02-23 18:54:44 +05:30
harshanL
021c27666c Removed governance dependencies 2015-02-21 02:00:55 +05:30
prabathabey
b52f8d8697 Making LicenseManagement OSGi service use the existing LicenseManagerImpl 2015-02-20 14:59:51 +05:30
prabathabey
916760275f Refactoring license management implementation 2015-02-19 17:24:50 +05:30
prabathabey
9ad8d6eab9 Refactoring License management functionality 2015-02-18 18:33:18 +05:30
prabathabey
a9a0ac5899 Fixing merge conflicts 2015-02-16 17:42:46 +05:30
prabathabey
8db95a349d Improving License handling functionality 2015-02-16 17:41:10 +05:30
manoj
cd3913d43d Remove Date Adaptor class 2015-02-13 19:43:47 +05:30
manoj
4d87e3f605 remove xml data adaptor 2015-02-13 15:01:42 +05:30
harshanL
1736d5db3e CDMF-8 fixes 2015-02-12 18:32:06 +05:30
harshanL
98ac04479d CDMF-6 fix 2015-02-10 18:28:18 +05:30
Geeth Munasinghe
05cee229d3 [maven-release-plugin] prepare for next development iteration 2015-02-09 17:45:18 +05:30
Geeth Munasinghe
ba12c63636 [maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2 2015-02-09 17:45:09 +05:30
Geeth Munasinghe
68f5cf6400 [maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2 2015-02-09 17:42:48 +05:30
Geeth Munasinghe
f0511a0b01 [maven-release-plugin] prepare for next development iteration 2015-02-09 17:41:29 +05:30
Geeth Munasinghe
5f72231731 [maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2 2015-02-09 17:41:21 +05:30
Geeth Munasinghe
13692f6355 [maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2 2015-02-09 15:02:25 +05:30
Geeth Munasinghe
3dd38392b1 [maven-release-plugin] prepare for next development iteration 2015-02-09 14:53:48 +05:30
Geeth Munasinghe
c6d993cee8 [maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2 2015-02-09 14:53:33 +05:30
Geeth Munasinghe
81d6a238c7 Changing the version to 0.9.0 and fixing some issues on poms 2015-02-09 14:51:57 +05:30
Geeth Munasinghe
f494143351 Separating the components from the product-cdm repository, all the commits will be survived. 2015-02-09 14:25:57 +05:30
Geeth Munasinghe
fb3e40bc2f Merge branch 'master' of https://github.com/wso2/product-cdm 2015-02-09 12:07:16 +05:30
Geeth Munasinghe
8c5fd85484 Changing the version to 1.0.0-SNAPSHOT 2015-02-09 12:06:04 +05:30
Geeth Munasinghe
0fd9875342 [maven-release-plugin] prepare for next development iteration 2015-02-08 12:30:55 +05:30
Geeth Munasinghe
ab92119231 [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-08 12:30:44 +05:30
Geeth Munasinghe
3e8591cccd Fixing issues in the pom for release purposes 2015-02-08 12:09:09 +05:30
Geeth Munasinghe
c3b26b3f1c [maven-release-plugin] prepare for next development iteration 2015-02-08 11:58:59 +05:30
Geeth Munasinghe
12e49a0b1a [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-08 11:58:49 +05:30
Geeth Munasinghe
4c30dfb9d8 [maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2 2015-02-08 11:54:54 +05:30
Geeth Munasinghe
aad4c8d244 [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-08 11:54:06 +05:30
manoj
815dc00344 Merge branch 'master' of https://github.com/wso2/product-cdm 2015-02-07 06:20:23 +05:30
manoj
4b81d04320 License Managment refactor 2015-02-07 06:14:20 +05:30
Geeth Munasinghe
17acce9458 [maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2 2015-02-06 20:32:24 +05:30
Geeth Munasinghe
5254511f5e [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-06 20:31:01 +05:30
Geeth Munasinghe
84fbde538e Fixing pom issues for release works 2015-02-06 20:27:32 +05:30
Geeth Munasinghe
c88ac79541 [maven-release-plugin] prepare for next development iteration 2015-02-05 19:22:54 +05:30
Geeth Munasinghe
8482d4cf27 [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-05 19:22:45 +05:30
Geeth Munasinghe
f67eee625a Changing the version to 1.0.0-SNAPSHOT 2015-02-05 19:04:32 +05:30
Geeth Munasinghe
da9443a065 [maven-release-plugin] prepare for next development iteration 2015-02-05 16:56:52 +05:30
Geeth Munasinghe
7418cb8d4d [maven-release-plugin] prepare release 1.1.0 2015-02-05 16:56:42 +05:30
Geeth Munasinghe
1942fd68b1 [maven-release-plugin] rollback the release of wso2cdm-parent-1.0.0 2015-02-05 16:50:24 +05:30
Geeth Munasinghe
ae4e56c9d6 [maven-release-plugin] prepare for next development iteration 2015-02-05 16:40:38 +05:30
Geeth Munasinghe
d57c56e36d [maven-release-plugin] prepare release wso2cdm-parent-1.0.0 2015-02-05 16:40:26 +05:30
Geeth Munasinghe
02d1a259df [maven-release-plugin] rollback the release of 1.0.0 2015-02-05 16:18:34 +05:30
Geeth Munasinghe
462e53070c [maven-release-plugin] prepare for next development iteration 2015-02-05 15:58:47 +05:30
Geeth Munasinghe
0d81d60c99 [maven-release-plugin] prepare release 1.0.0 2015-02-05 15:58:37 +05:30
Geeth Munasinghe
ac609f9996 Changing the version to 1.0.0-SNAPSHOT 2015-02-05 14:55:27 +05:30
manoj
8cd5f6d61f Default License ManagementY 2015-02-05 13:11:10 +05:30
manoj
394258d10f Default License feature 2015-02-05 13:10:26 +05:30
manoj
b21676a639 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java 
Default License feature
 2015-02-05 13:09:48 +05:30
Geeth Munasinghe
e1b94822ab [maven-release-plugin] prepare for next development iteration 2015-02-05 12:35:56 +05:30
Geeth Munasinghe
7f0558448e [maven-release-plugin] prepare release 1.0.0 2015-02-05 12:35:47 +05:30
prabathabey
d6a22b06ff Fixing more SNAPSHOT versions, used in carbon-governance, carbon-deployment related components 2015-02-02 21:13:52 +05:30
harshanL
d84a3c47d2 Removed private package declaration in device common bundle & added doc comments 2015-02-02 08:04:13 +05:30
prabathabey
5d9fb3b803 Refactoring the poms to remove SNAPSHOT versions of certain dependencies and test clean up 2015-01-31 18:49:56 +05:30
Geeth Munasinghe
f44b4597db Fixing group ids of the pom files 2015-01-29 20:03:04 +05:30
manoj
66efd5d301 License Management Refactor 2015-01-27 23:45:45 +05:30
manoj
505b87a655 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
 2015-01-27 23:20:49 +05:30
manoj
428554cfe8 Unit test change to prepared statement 2015-01-27 21:51:28 +05:30
manoj
f907684a0b license constants Refactor 2015-01-27 21:38:08 +05:30
manoj
2eadf11eaf Refactor license constants 2015-01-27 21:37:23 +05:30
manoj
79261210f2 Refactor license constants 2015-01-27 21:35:14 +05:30
manoj
62f858d606 License Management Refactor 2015-01-27 21:28:04 +05:30
prabathabey
d439691a01 Fixing formatting issues 2015-01-27 20:27:16 +05:30
manoj
6e262cb60b set active status for enroll device 2015-01-27 20:22:38 +05:30
Prabath Abeysekara
a4ffdf1aa5 Merge pull request #7 from manojgunayadev/master 
set active status for enroll device
 2015-01-27 20:21:56 +05:30
manoj
60e539b583 set active status for enroll device 2015-01-27 20:20:42 +05:30
manoj
b56e42792a set active status for enroll device 2015-01-27 20:18:15 +05:30
Dulitha Wijewantha
c8d510eea7 Merge branch 'master' of github.com:wso2/product-cdm 2015-01-23 22:03:24 +05:30
Dulitha Wijewantha
7f3516b2a6 * Added a description to the feature object 
* Added the COMMAND enum to the Operation class
 2015-01-23 21:52:00 +05:30
prabathabey
4fd229357a Enabling logging for test case implementations 2015-01-23 21:24:02 +05:30
Dulitha Wijewantha
9e68b5fdb8 Merge branch 'master' of github.com:wso2/product-cdm 2015-01-23 18:40:23 +05:30
manoj
10e97b3ae1 License Management 2015-01-23 18:32:21 +05:30
Geeth Munasinghe
7718a4cb84 Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master 2015-01-23 18:29:58 +05:30
Dulitha Wijewantha
277f0341b1 * Add device type to the feature 
* Added method to operation manager to get features by type
* Added an exception for feature management
 2015-01-23 18:29:28 +05:30
Geeth Munasinghe
5fed717491 Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master 2015-01-23 18:25:16 +05:30