Commit Graph

3852 Commits

Author SHA1 Message Date
Gathika94
dcac19480f removed unnecessary files 2017-11-22 23:26:09 +05:30
warunalakshitha
2313928741 Add remote control configurations as remove unused methods 2017-11-22 22:52:11 +05:30
Gathika94
f4af47fae4 added unit and page 2017-11-22 21:42:54 +05:30
Gathika94
2e082fbbb7 removed unnecessary classes 2017-11-22 16:32:14 +05:30
WSO2 Builder
4c68ddd752 [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare for next development iteration 2017-11-22 10:42:23 +00:00
WSO2 Builder
f28b740e9c [WSO2 Release] [Jenkins #2802] [Release 3.0.179] prepare release v3.0.179 2017-11-22 10:42:08 +00:00
Gathika94
ad061d09a6 device details can be get through the api 2017-11-22 16:06:31 +05:30
Gathika94
f5d1ab7403 backend api working properly 2017-11-22 16:06:31 +05:30
Gathika94
c74a56cb45 geo hash algorithm 2017-11-22 16:06:31 +05:30
Gathika94
d3eb32b5cc working on ui features 2017-11-22 16:06:31 +05:30
Gathika94
4eb66f4e6b api for getting devices in geo grid working fine 2017-11-22 16:06:31 +05:30
charitha
f2fbf97b91 Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine 2017-11-22 15:41:23 +05:30
charitha
a966dc2655 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-22 15:40:34 +05:30
WSO2 Builder
16750a6f96 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare for next development iteration 2017-11-22 09:19:46 +00:00
WSO2 Builder
46c732a2a9 [WSO2 Release] [Jenkins #2800] [Release 3.0.178] prepare release v3.0.178 2017-11-22 09:19:31 +00:00
charitha
0f7e8b6435 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-22 14:43:50 +05:30
charitha
713c6a6755 Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
2017-11-22 14:43:29 +05:30
dunithd
7cdea248f7 Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
2017-11-22 11:14:55 +05:30
Dunith Dhanushka
7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
2017-11-22 11:14:32 +05:30
WSO2 Builder
22fac48873 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration 2017-11-17 10:03:15 +00:00
WSO2 Builder
62678dd003 [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare release v3.0.177 2017-11-17 10:03:02 +00:00
WSO2 Builder
41db467d7b [WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare for next development iteration 2017-11-17 09:27:07 +00:00
WSO2 Builder
af3f8a976f [WSO2 Release] [Jenkins #2797] [Release 3.0.176] prepare release v3.0.176 2017-11-17 09:26:43 +00:00
Ace
4b2955984f Resolving conflicts for Remote Control feature on behalf of Waruna 2017-11-17 14:27:30 +05:30
WSO2 Builder
3097d8394f [WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare for next development iteration 2017-11-17 06:58:17 +00:00
WSO2 Builder
85f895d4a8 [WSO2 Release] [Jenkins #2795] [Release 3.0.175] prepare release v3.0.175 2017-11-17 06:58:03 +00:00
Menaka Jayawardena
a9150da115 Added class level comments. 2017-11-17 11:58:30 +05:30
Menaka Jayawardena
46555cfe3a Fixing code formatting issues in SearchManagementTestCases. 2017-11-17 11:58:30 +05:30
Menaka Jayawardena
a9f2a0a228 Fixing code formatting issues in PermissionManagerServiceTests 2017-11-17 11:56:41 +05:30
Menaka Jayawardena
e342507349 Fixing code formatting issues in DeviceTypeManagementService 2017-11-17 11:56:41 +05:30
Menaka Jayawardena
af8ab1f59b Fixing code formatting issues in DeviceTypeManagementAdminService 2017-11-17 11:56:41 +05:30
Menaka Jayawardena
9e71b3d18e Fixing code formatting issues in DeviceAgentServiceTest 2017-11-17 11:56:41 +05:30
WSO2 Builder
477eb4d703 [WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare for next development iteration 2017-11-17 05:41:29 +00:00
WSO2 Builder
85904edfe9 [WSO2 Release] [Jenkins #2793] [Release 3.0.174] prepare release v3.0.174 2017-11-17 05:41:16 +00:00
WSO2 Builder
0c032443f9 Merge commit '4620ca4a6ec6fddd221a074eb2d6bbb81a62babf' into d250b2c0-4c43-40c8-af8b-ab3fdf3a7436 2017-11-17 05:18:27 +00:00
WSO2 Builder
4620ca4a6e [WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare for next development iteration 2017-11-17 05:08:44 +00:00
WSO2 Builder
aca017b9bd [WSO2 Release] [Jenkins #2792] [Release 3.0.173] prepare release v3.0.173 2017-11-17 05:08:25 +00:00
Ruwan
ee0195f740
Merge pull request #950 from dilee/master
Minor refactorings and fixing formatting issues
2017-11-17 10:16:27 +05:30
Ruwan
0166f73410
Merge pull request #1092 from madawas/api-unit-tests
Test Cases for DeviceManagementServiceImpl
2017-11-17 10:10:06 +05:30
WSO2 Builder
1b8ecafce5 [WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare for next development iteration 2017-11-13 04:18:35 +00:00
WSO2 Builder
7ee80afc09 [WSO2 Release] [Jenkins #2790] [Release 3.0.172] prepare release v3.0.172 2017-11-13 04:18:21 +00:00
WSO2 Builder
9cbc4a5da3 [WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare for next development iteration 2017-11-02 09:46:46 +00:00
WSO2 Builder
86eb38569b [WSO2 Release] [Jenkins #2788] [Release 3.0.171] prepare release v3.0.171 2017-11-02 09:46:31 +00:00
Madawa Soysa
33e39415de
Revert "Fix for EMM-1298" 2017-11-02 14:18:45 +05:30
Madawa Soysa
8ad597342e Test Cases for DeviceManagementServiceImpl 2017-11-01 11:52:57 +05:30
WSO2 Builder
b929ba11d3 [WSO2 Release] [Jenkins #2786] [Release 3.0.170] prepare for next development iteration 2017-10-30 07:06:11 +00:00
WSO2 Builder
ccba297aca [WSO2 Release] [Jenkins #2786] [Release 3.0.170] prepare release v3.0.170 2017-10-30 07:05:57 +00:00
Charitha Goonetilleke
448ff20baa
Update response message 2017-10-30 12:09:12 +05:30
charitha
1eb2e54ae8 Resolve test failures and issues after merging with upstream 2017-10-30 11:15:20 +05:30
charitha
6e62c3d64e Refactor after merging 2017-10-30 10:14:00 +05:30
charitha
b3094277fd Merge branch 'master' into add-emm-analytics
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
2017-10-30 10:11:15 +05:30
WSO2 Builder
60b3060b4c [WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration 2017-10-23 09:40:36 +00:00
WSO2 Builder
0b72a71e6f [WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare release v3.0.169 2017-10-23 09:40:22 +00:00
kamidu
9fb13e38cf enable billing cache invalidation 2017-10-23 12:52:45 +05:30
WSO2 Builder
8f860e34a1 [WSO2 Release] [Jenkins #2782] [Release 3.0.168] prepare for next development iteration 2017-10-20 11:44:06 +00:00
WSO2 Builder
3d18b11c17 [WSO2 Release] [Jenkins #2782] [Release 3.0.168] prepare release v3.0.168 2017-10-20 11:43:52 +00:00
Harshan Liyanage
371de9419f Merge pull request #1080 from menakaj/master
Test cases for DeviceAgentService.
2017-10-20 16:52:44 +05:30
Menaka Jayawardena
88195a3f4b Code formatting. 2017-10-20 16:23:22 +05:30
Menaka Jayawardena
52f3b541bc Test cases for getOperation method and fixes. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
9af560f878 Test cases for updateOperation method. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
3d70110217 Test cases for getNextPendingOperation method. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
70417fa7b1 Test cases for getPendingOperations method. 2017-10-20 16:13:39 +05:30
Menaka Jayawardena
a80f0246ad Extended the test cases for the Publish event method. 2017-10-20 16:13:39 +05:30
WSO2 Builder
8c80836f72 [WSO2 Release] [Jenkins #2780] [Release 3.0.167] prepare for next development iteration 2017-10-20 10:35:17 +00:00
WSO2 Builder
fd86095fd2 [WSO2 Release] [Jenkins #2780] [Release 3.0.167] prepare release v3.0.167 2017-10-20 10:35:03 +00:00
sinthuja
bf3a701637 Merge pull request #1079 from Megala21/master
Adding test cases for GroupManagementService
2017-10-20 15:42:16 +05:30
megala21
7c92849a03 Adding test cases for GroupManagementService 2017-10-20 15:26:14 +05:30
WSO2 Builder
593090de40 [WSO2 Release] [Jenkins #2778] [Release 3.0.166] prepare for next development iteration 2017-10-20 07:29:23 +00:00
WSO2 Builder
9ee51eb816 [WSO2 Release] [Jenkins #2778] [Release 3.0.166] prepare release v3.0.166 2017-10-20 07:29:09 +00:00
WSO2 Builder
5f6fe29e52 [WSO2 Release] [Jenkins #2776] [Release 3.0.165] prepare for next development iteration 2017-10-20 06:12:10 +00:00
WSO2 Builder
a9bb2f8723 [WSO2 Release] [Jenkins #2776] [Release 3.0.165] prepare release v3.0.165 2017-10-20 06:11:56 +00:00
megala21
fc82bf3f95 Adding test cases for ConfigurationManagementService 2017-10-20 10:48:45 +05:30
megala21
5f0712dd38 Refactoring 2017-10-19 16:54:16 +05:30
megala21
37248de07f Adding test cases for notification managementservice 2017-10-19 16:47:35 +05:30
megala21
4228ddd416 Refactoring 2017-10-19 15:46:28 +05:30
megala21
68533808c5 Adding test cases for UserManagementServicee 2017-10-19 15:43:41 +05:30
WSO2 Builder
f724ff341f [WSO2 Release] [Jenkins #2774] [Release 3.0.164] prepare for next development iteration 2017-10-18 10:27:42 +00:00
WSO2 Builder
7026020140 [WSO2 Release] [Jenkins #2774] [Release 3.0.164] prepare release v3.0.164 2017-10-18 10:27:28 +00:00
Menaka Jayawardena
c0eb389ece Removed device info persisting in the time of device enrollment and fixed the test case. 2017-10-18 15:32:19 +05:30
WSO2 Builder
4b7cd32aca [WSO2 Release] [Jenkins #2772] [Release 3.0.163] prepare for next development iteration 2017-10-17 16:23:41 +00:00
WSO2 Builder
04f2bff9bb [WSO2 Release] [Jenkins #2772] [Release 3.0.163] prepare release v3.0.163 2017-10-17 16:23:27 +00:00
Megala Uthayakumar
76938fc44d Merge pull request #1075 from sinthuja/origin-wso2-master
Adding mock datasources to cover the source from different databases.
2017-10-17 20:55:24 +05:30
sinthuja
10365c108b Code cleanup. 2017-10-17 19:15:29 +05:30
WSO2 Builder
871bc2bb6e [WSO2 Release] [Jenkins #2770] [Release 3.0.162] prepare for next development iteration 2017-10-17 13:39:07 +00:00
WSO2 Builder
7652cf841f [WSO2 Release] [Jenkins #2770] [Release 3.0.162] prepare release v3.0.162 2017-10-17 13:38:53 +00:00
sinthuja
0252a5f2eb Covering more database specific method calls. 2017-10-17 19:02:57 +05:30
sinthuja
4d2d7b9ef5 Updating the failing Group management testcase with the database configuration. 2017-10-17 18:40:53 +05:30
sinthuja
91e1268ca8 updating the default configurations for test cases. 2017-10-17 18:33:27 +05:30
sinthuja
d214411f9a Merge branch 'wso2-master' into origin-wso2-master
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java
2017-10-17 18:31:47 +05:30
sinthuja
7a26fb6a93 adding some testcases for the mocking database operations. 2017-10-17 18:27:35 +05:30
WSO2 Builder
788ce76e6e [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
WSO2 Builder
ab7d1ec88e [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare release v3.0.161 2017-10-17 12:27:11 +00:00
megala21
2c69c1bc10 Refactoring 2017-10-17 16:09:01 +05:30
megala21
8967c45aaa Merge remote-tracking branch 'upstream/master' into wso2master 2017-10-17 13:51:17 +05:30
megala21
b392f93aab Adding negative test cases for GroupProviderServiceImpl 2017-10-17 13:49:45 +05:30
sinthuja
b419644a22 Adding more datasources configuration. 2017-10-17 10:46:04 +05:30
sinthuja
635f84897d Making datasource and isMock parameters as optional, and passing the default params. 2017-10-17 10:22:03 +05:30
WSO2 Builder
bd7ac8a368 [WSO2 Release] [Jenkins #2766] [Release 3.0.160] prepare for next development iteration 2017-10-17 04:45:30 +00:00
WSO2 Builder
9d0dcaf7a5 [WSO2 Release] [Jenkins #2766] [Release 3.0.160] prepare release v3.0.160 2017-10-17 04:45:16 +00:00
sinthuja
b9131fa141 Adding mock database impl. 2017-10-16 18:08:10 +05:30
WSO2 Builder
df217e9e1e [WSO2 Release] [Jenkins #2764] [Release 3.0.159] prepare for next development iteration 2017-10-16 12:36:50 +00:00
WSO2 Builder
9697ad3776 [WSO2 Release] [Jenkins #2764] [Release 3.0.159] prepare release v3.0.159 2017-10-16 12:36:35 +00:00
Harshan Liyanage
244f3d5b3f Merge pull request #1073 from menakaj/master
Test cases for DeviceAgentServceImpl.
2017-10-16 17:44:10 +05:30
Menaka Jayawardena
ee6227aee8 Added licence header. 2017-10-16 17:41:08 +05:30
Menaka Jayawardena
f812e614d9 Test cases for DeviceAgentService PublishEvents(Map). 2017-10-16 17:27:24 +05:30
Menaka Jayawardena
350fff346d Test cases for DeviceAgentService: updateDevice. 2017-10-15 12:27:19 +05:30
WSO2 Builder
48bc9b661d [WSO2 Release] [Jenkins #2762] [Release 3.0.158] prepare for next development iteration 2017-10-15 05:13:02 +00:00
WSO2 Builder
06abe8dd6e [WSO2 Release] [Jenkins #2762] [Release 3.0.158] prepare release v3.0.158 2017-10-15 05:12:47 +00:00
WSO2 Builder
dc68ab1931 [WSO2 Release] [Jenkins #2760] [Release 3.0.157] prepare for next development iteration 2017-10-15 04:01:47 +00:00
WSO2 Builder
971378b59d [WSO2 Release] [Jenkins #2760] [Release 3.0.157] prepare release v3.0.157 2017-10-15 04:01:31 +00:00
Madawa Soysa
d49f656b53 Merge pull request #1066 from madawas/api-unit-tests
More unit test cases to DeviceManagementService class
2017-10-15 09:08:04 +05:30
Menaka Jayawardena
1aff0cba7b Test cased for Device Agent Service. 2017-10-15 00:28:37 +05:30
WSO2 Builder
144a598323 [WSO2 Release] [Jenkins #2758] [Release 3.0.156] prepare for next development iteration 2017-10-13 20:00:52 +00:00
WSO2 Builder
b9273aeec0 [WSO2 Release] [Jenkins #2758] [Release 3.0.156] prepare release v3.0.156 2017-10-13 20:00:38 +00:00
WSO2 Builder
dbf67e04fa [WSO2 Release] [Jenkins #2756] [Release 3.0.155] prepare for next development iteration 2017-10-13 18:41:16 +00:00
WSO2 Builder
31a03c1142 [WSO2 Release] [Jenkins #2756] [Release 3.0.155] prepare release v3.0.155 2017-10-13 18:41:02 +00:00
WSO2 Builder
fae0733ff8 [WSO2 Release] [Jenkins #2754] [Release 3.0.154] prepare for next development iteration 2017-10-13 11:47:14 +00:00
WSO2 Builder
d8198b8366 [WSO2 Release] [Jenkins #2754] [Release 3.0.154] prepare release v3.0.154 2017-10-13 11:46:59 +00:00
WSO2 Builder
7b1d7f4415 Merge commit 'a2b0961fe4ba1d54080c68a7252d179bc0503c2e' into fafee9c0-c068-473c-9dec-eeecdb1096c4 2017-10-13 11:27:00 +00:00
WSO2 Builder
a2b0961fe4 [WSO2 Release] [Jenkins #2753] [Release 3.0.153] prepare for next development iteration 2017-10-13 11:14:49 +00:00
WSO2 Builder
c2e485ae5a [WSO2 Release] [Jenkins #2753] [Release 3.0.153] prepare release v3.0.153 2017-10-13 11:14:12 +00:00
Madawa Soysa
11b690354f More unit test cases to DeviceManagementService class 2017-10-13 16:37:14 +05:30
Megala Uthayakumar
060ad43dc0 Merge pull request #1065 from GDLMadushanka/master
unit tests for DeviceCacheManagerImpl
2017-10-13 16:31:42 +05:30
GDLMadushanka
ef83ddaa3a refactoring 2017-10-13 16:30:28 +05:30
GDLMadushanka
6aba996065 required changes for pr 2017-10-13 16:28:45 +05:30
WSO2 Builder
73efa46649 Merge commit 'aa64f2c9b93b29cf2736f9cb3543f69c87fd89e3' into 372e8d53-61d4-4dc5-a19b-a4858cfc39b4 2017-10-13 10:50:30 +00:00
WSO2 Builder
aa64f2c9b9 [WSO2 Release] [Jenkins #2752] [Release 3.0.152] prepare for next development iteration 2017-10-13 10:40:41 +00:00
WSO2 Builder
4daaf88865 [WSO2 Release] [Jenkins #2752] [Release 3.0.152] prepare release v3.0.152 2017-10-13 10:40:21 +00:00
GDLMadushanka
0a1ba59307 refactoring 2017-10-13 16:10:00 +05:30
GDLMadushanka
520529f474 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-10-13 16:07:07 +05:30
GDLMadushanka
74814b2932 unit tests for DeviceCacheManagerImpl 2017-10-13 16:06:43 +05:30
Kamidu Sachith Punchihewa
f9d4cdb727 Merge pull request #1064 from menakaj/master
Test cases for DeviceTypeManagementAdminService
2017-10-13 15:59:49 +05:30
Menaka Jayawardena
c15068ad31 Test cased for DeviceTypeManagementAdminService. 2017-10-13 15:50:41 +05:30
Menaka Jayawardena
ce7b28f2fb Removed unthrown Exception. 2017-10-13 15:23:53 +05:30
WSO2 Builder
5e50898ed2 [WSO2 Release] [Jenkins #2750] [Release 3.0.151] prepare for next development iteration 2017-10-13 09:31:17 +00:00
WSO2 Builder
8de35b43e6 [WSO2 Release] [Jenkins #2750] [Release 3.0.151] prepare release v3.0.151 2017-10-13 09:31:02 +00:00
Ace
66c4a345fd Fixing bugs when getting device by status and adding test cases 2017-10-13 14:24:49 +05:30
Madawa Soysa
04ef82520f Merge pull request #1060 from menakaj/master
Test cases for DeviceTypeManagementService.
2017-10-13 14:07:01 +05:30
WSO2 Builder
aef09c0296 [WSO2 Release] [Jenkins #2748] [Release 3.0.150] prepare for next development iteration 2017-10-13 08:22:41 +00:00
WSO2 Builder
4c0d61aad0 [WSO2 Release] [Jenkins #2748] [Release 3.0.150] prepare release v3.0.150 2017-10-13 08:22:27 +00:00
Menaka Jayawardena
35ebf6606d Removed System.out 2017-10-13 13:33:18 +05:30
Menaka Jayawardena
154b3b65b7 Refactoring as per the code review. 2017-10-13 13:27:59 +05:30
Menaka Jayawardena
1938ef77b9 Refactoring. 2017-10-13 13:01:50 +05:30
Menaka Jayawardena
f9a040d303 Test cases for DeviceTypeManagementService. 2017-10-13 12:50:39 +05:30
WSO2 Builder
dae5fe172f [WSO2 Release] [Jenkins #2746] [Release 3.0.149] prepare for next development iteration 2017-10-13 05:54:11 +00:00
WSO2 Builder
57419a8d7b [WSO2 Release] [Jenkins #2746] [Release 3.0.149] prepare release v3.0.149 2017-10-13 05:53:58 +00:00
WSO2 Builder
efaac2cf21 Merge commit 'c4206ee923353eb1b642ff80c0c62553c5407d59' into 722f2ddb-c84d-40af-ac47-00e12e3e08ed 2017-10-13 05:31:37 +00:00
WSO2 Builder
c4206ee923 [WSO2 Release] [Jenkins #2745] [Release 3.0.148] prepare for next development iteration 2017-10-13 05:22:43 +00:00
WSO2 Builder
9874c237be [WSO2 Release] [Jenkins #2745] [Release 3.0.148] prepare release v3.0.148 2017-10-13 05:22:23 +00:00
Madawa Soysa
5bfcf90705 Merge pull request #1052 from madawas/api-unit-tests
Initial unit tests for device management rest API
2017-10-13 10:51:27 +05:30