Commit Graph

795 Commits

Author SHA1 Message Date
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
milanperera
596a99d412 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 16:57:21 +05:30
prabathabey
84bc22f9f3 Setting default values for fields validFrom and validTo 2015-07-30 16:56:45 +05:30
milanperera
05a2339cea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 16:17:11 +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
milanperera
df61f9263a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 10:19:07 +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
milanperera
9fcea34d73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-29 08:31:33 +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
milanperera
c0b0975929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-28 15:35:00 +05:30
milanperera
63721cb79d Refactored 2015-07-28 15:34:38 +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
milanperera
f0ec3dbe4c Fixed NPE issues in policy-mgt 2015-07-27 10:49:46 +05:30
prabathabey
b298407160 Fixing improper parent configurations found in apimgt.extensions component and feature 2015-07-25 13:29:57 +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
prabathabey
bfa1ea1875 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-24 12:36:35 +05:30
milanperera
5b2e0c8989 Merged 2015-07-24 12:32:26 +05:30
geethkokila
fde54d2d32 Fixing the monitoring service 2015-07-24 12:26:57 +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
geethkokila
fcb7530d3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-23 15:32:27 +05:30
geethkokila
2769392bc0 Fixing the monitoring task for not to notify the blocked and inactive devices 2015-07-23 15:32:12 +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
8ab843e76c Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
Merging the milan's changes
2015-07-22 17:59:45 +05:30
milanperera
35ac8ec6c9 Fixed formating issues in PolicyManagerImpl 2015-07-22 17:53:58 +05:30
milanperera
de6572d819 Fixed for JIRA MDM-372 2015-07-22 17:46:40 +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
geethkokila
397fb7113e Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master 2015-07-21 19:51:28 +05:30
milanperera
7313ba1e7e Implemented policy monitoring add operation 2015-07-21 19:43:22 +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
00b9303283 Fixed the issue with java package name 2015-07-21 10:26:24 +05:30
geethkokila
c4739efd0e Fixing the policy monitoring service adding 2015-07-20 19:05:13 +05:30
geethkokila
9ca5815ec3 Fixing the saving issues 2015-07-20 16:47:25 +05:30
harshanl
57299063b3 Added policy configuration to the cdm-config 2015-07-20 11:16:15 +05:30
geethkokila
e0301e4ce3 Adding the 90% completed monitoring task 2015-07-20 10:49:37 +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
milanperera
eeca0d4ded Refactored DCA 2015-07-14 14:55:18 +05:30
milanperera
1d18c6de1e Refactored DCA 2015-07-14 14:43:01 +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
geethkokila
d048913e06 Adding the momitoring task partialy 2015-07-13 10:55:27 +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
prabathabey
8073d46f58 Cleaning up Dynamic Client Registration implementation 2015-07-09 15:37:27 +05:30
prabathabey
85aec417e5 Setting target version of maven compiler plugin to 1.7 2015-07-08 23:23:45 +05:30
mharindu
52b4902aa5 Refactored dynamic-client-registration unregister function 2015-07-08 22:27:24 +05:30
prabathabey
2dc1c7341a Improving the current dynamic client authentication to be more spec compliant 2015-07-08 21:28:51 +05:30
mharindu
440194632c Implemented dynamic-client-authentication unregister function 2015-07-08 17:01:02 +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