prabathabey
|
de2c378214
|
Code cleanup
|
2015-08-24 10:15:50 +05:30 |
|
prabathabey
|
f66d1dd07b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-24 10:14:22 +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 |
|
Dilshan Edirisuriya
|
6cff144573
|
Merge pull request #26 from milanperera/master
Added null check to MonitoringManagerImpl
|
2015-08-22 05:16:26 +05:30 |
|
mharindu
|
fa82a28c0f
|
Added null check to MonitoringManagerImpl
|
2015-08-22 05:15:05 +05:30 |
|
prabathabey
|
2311572d49
|
code cleanup
|
2015-08-22 04:48:24 +05:30 |
|
prabathabey
|
cd31662a96
|
Fixing transactional anomalies found in PolicyManagerImpl
|
2015-08-22 04:42:35 +05:30 |
|
prabathabey
|
05c3d080e0
|
Fixing transactional anomalies found in PolicyManagerImpl
|
2015-08-22 04:09:59 +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 |
|
Dilshan Edirisuriya
|
5b46a4e2f8
|
Commenting out unreachable state for now
|
2015-08-21 14:46:49 +05:30 |
|
geethkokila
|
cceb3ac5db
|
Fixing errors and adding caching sketch
|
2015-08-21 12:09:32 +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
|
90f8f4aab6
|
Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
|
2015-08-07 13:03:34 +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 |
|
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 |
|