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
7,002 Commits 31 Branches 461 Tags 183 MiB
ae476d85df
Commit Graph

5665 Commits

Author SHA1 Message Date
Ace
fc7f80c543 Removing un-necessary checks when retrieving getAllDeviceInfo 2018-02-22 13:03:16 +05:30
WSO2 Builder
a29736e09e [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare for next development iteration 2018-02-21 04:15:10 +00:00
WSO2 Builder
59265f4add [WSO2 Release] [Jenkins #2915] [Release 3.0.227] prepare release v3.0.227 2018-02-21 04:14:57 +00:00
Madawa Soysa
b911c9e169 Adding entity application mapping to the database 
When an application installation request is made other than adding an application install operation a mapping between the devices and the installed applications are kept in the database. In a case where an enterprise wide installation happens a mapping is made with the respective entity and the application.

This commit implement the mapping function.

Related to issue wso2/product-iots#1688
 2018-02-20 18:51:34 +05:30
kamidu
f87a3a6b08 Fixing the issue when marking as read notification 
The issue occures when the notification id is larger than 45 due to the restiction on paramater size. I have removed the related validation in order to resolve the issue.
 2018-02-20 14:33:33 +05:30
Rasika Perera
bc18d60c55 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-20 14:28:21 +05:30
Rasika Perera
49f97f02e8 Fixing platform filtering not working correctly 
Resolves https://github.com/wso2/product-iots/issues/1689
 2018-02-20 14:28:03 +05:30
Ruwan
40ae5a09a2
Merge pull request #1184 from ruwany/master 
Fixed https://github.com/wso2/carbon-device-mgt/issues/1175
 2018-02-20 12:17:32 +05:30
Rasika Perera
8e3a298bb0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1689 2018-02-19 19:50:05 +05:30
Rasika Perera
528837ce1f Fixing platform filtering not working correctly 
Resolves https://github.com/wso2/product-iots/issues/1689
 2018-02-19 19:49:45 +05:30
WSO2 Builder
00b2ded5ea [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare for next development iteration 2018-02-19 12:56:51 +00:00
WSO2 Builder
1a107902fe [WSO2 Release] [Jenkins #2910] [Release 3.0.226] prepare release v3.0.226 2018-02-19 12:56:37 +00:00
Charitha Goonetilleke
2832644d4b
Merge pull request #1187 from rasika/fix-1689 
Fixing issue of devices listing page filters are not showing all the available filtering options
 2018-02-19 18:14:21 +05:30
Rasika Perera
b5f4bd757a Fixing devices listing page filters are not showing all the available filtering options 
Resolves https://github.com/wso2/product-iots/issues/1689
 2018-02-19 17:23:22 +05:30
Madawa Soysa
debe93cb03 Improving application subscription API 
Changing the DeviceIdentifier bean to the same as org.wso2.carbon.device.mgt.common.DeviceIdentifier and implement the install app device.

Adding an ApplicationInstallResponse as the response to respond with more information to the application install request.

related to wso2/product-iots#1688
 2018-02-19 10:22:08 +05:30
Madawa Soysa
f66ff60ada Adding a method to retrieve Application by UUID 
Application install request is made for a UUID which is associated with an application release. In order to get the details of the application to build the payload of the install application operation, it is required to get the application from the database related to the UUID.
 2018-02-19 10:22:08 +05:30
Madawa Soysa
690eff6660 Refactoring mobile application subscription API 2018-02-19 10:22:08 +05:30
Ace
2516967159 Fixing test failure 2018-02-15 13:31:34 +05:30
lasantha
6792c21210 Rmoved the lifecycle managemt 
Removed the lifecycle management core and formatted the source
 2018-02-15 10:36:28 +05:30
Ace
e604532b28 Fixing fomatting issues 2018-02-15 08:50:16 +05:30
Ace
bba4b09284 Adding comments 2018-02-15 08:30:34 +05:30
Ace
81cb39a4a6 Fixed https://github.com/wso2/carbon-device-mgt/issues/1175 2018-02-14 21:27:39 +05:30
lasantha
9b1820dca5 Adding Lifecycle Management functionalities and fixed related bugs 2018-02-14 16:51:49 +05:30
WSO2 Builder
9c9a37b42b [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare for next development iteration 2018-02-13 05:04:50 +00:00
WSO2 Builder
0d9364671a [WSO2 Release] [Jenkins #2908] [Release 3.0.225] prepare release v3.0.225 2018-02-13 05:04:36 +00:00
charitha
a876b65974 Fixed regression issues related to https://github.com/wso2/product-iots/issues/1671 2018-02-12 20:16:06 +05:30
Madawa Soysa
3a44421cea Fixing policy view interface not loading issue 
When a policy is created and viewed the policy using the policy view icon the page keeps loading sometimes due to undefined deviceGroups variable inside the policyPayloadObj. 

This commit fixes this issue by improving the code where the null check has been made to check if the  deviceGroup is null. Also made few improvements in the code where the checks have been made.

Resolves wso2/product-iots#1681
 2018-02-12 14:56:50 +05:30
WSO2 Builder
436fb63d93 [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare for next development iteration 2018-02-10 17:15:41 +00:00
WSO2 Builder
3f095b4b6a [WSO2 Release] [Jenkins #2906] [Release 3.0.224] prepare release v3.0.224 2018-02-10 17:15:27 +00:00
charitha
c600719f3c Fixed https://github.com/wso2/product-iots/issues/1671 2018-02-10 21:48:30 +05:30
WSO2 Builder
ee53943d3e [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare for next development iteration 2018-02-07 09:48:07 +00:00
WSO2 Builder
ac7126bc13 [WSO2 Release] [Jenkins #2904] [Release 3.0.223] prepare release v3.0.223 2018-02-07 09:47:53 +00:00
lasantha
fb8d9dd494 refactored the source and fixed some bugs 2018-02-07 00:14:01 +05:30
WSO2 Builder
01cd9eb3ef [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare for next development iteration 2018-02-06 15:17:31 +00:00
WSO2 Builder
b5a10cc078 [WSO2 Release] [Jenkins #2902] [Release 3.0.222] prepare release v3.0.222 2018-02-06 15:17:16 +00:00
WSO2 Builder
65fe3ade2e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare for next development iteration 2018-02-06 10:02:17 +00:00
WSO2 Builder
2356b6114e [WSO2 Release] [Jenkins #2900] [Release 3.0.221] prepare release v3.0.221 2018-02-06 10:02:03 +00:00
Rasika Perera
afe66f237a Fix https://github.com/wso2/product-iots/issues/1659 (#1177) 2018-02-06 15:11:32 +05:30
lasantha
669881eae7 adding appliction release functionalites and fixed build failure 2018-02-05 19:23:57 +05:30
lasantha
f17c36d13f Added app release updating fucntionality and fixed APPM related bugs 2018-02-04 23:28:07 +05:30
lasantha
c392f0e57d merge with upstream and fixed conflicts 2018-02-04 04:13:14 +05:30
lasantha
fdac04dd3e complete app release getting flow and fixed related bugs 2018-02-04 04:05:04 +05:30
lasantha
569007514e Added app release creation method and fixed issues 2018-02-02 12:59:31 +05:30
WSO2 Builder
0b4882e667 [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare for next development iteration 2018-02-01 06:22:08 +00:00
WSO2 Builder
647beefcab [WSO2 Release] [Jenkins #2898] [Release 3.0.220] prepare release v3.0.220 2018-02-01 06:21:54 +00:00
WSO2 Builder
82f2567255 [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare for next development iteration 2018-01-29 12:03:48 +00:00
WSO2 Builder
14770bb7bd [WSO2 Release] [Jenkins #2896] [Release 3.0.219] prepare release v3.0.219 2018-01-29 12:03:34 +00:00
Rasika Perera
16b0615577
Merge pull request #1170 from rasika/fix-1629 
Fixing group operations bar not shown when "Select All" is clicked
 2018-01-29 17:11:00 +05:30
WSO2 Builder
83c74259cd [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare for next development iteration 2018-01-29 11:23:51 +00:00
WSO2 Builder
5b4e6f1d4d [WSO2 Release] [Jenkins #2894] [Release 3.0.218] prepare release v3.0.218 2018-01-29 11:23:36 +00:00
Kamidu Sachith Punchihewa
952c1fe28d
Merge pull request #1173 from rasika/fix-1624 
Fixing regression issues for the validations
 2018-01-29 16:38:40 +05:30
Rasika Perera
7673dca496 Fixing regression issues 2018-01-29 16:24:36 +05:30
WSO2 Builder
9bbf7cc54a [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare for next development iteration 2018-01-29 08:45:58 +00:00
WSO2 Builder
407ee4ed43 [WSO2 Release] [Jenkins #2892] [Release 3.0.217] prepare release v3.0.217 2018-01-29 08:45:43 +00:00
lasantha
317386afb8 bump version of the app manager component 2018-01-28 10:29:54 +05:30
lasantha
ae1c99f665 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into application-mgt-new 2018-01-28 09:27:16 +05:30
lasantha
02415dfd92 merge with upstream master 2018-01-28 09:26:30 +05:30
WSO2 Builder
3014089807 [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare for next development iteration 2018-01-26 14:21:01 +00:00
WSO2 Builder
3dd8c8bf2f [WSO2 Release] [Jenkins #2890] [Release 3.0.216] prepare release v3.0.216 2018-01-26 14:20:44 +00:00
Rasika Perera
7db642a9be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1629 2018-01-26 19:43:55 +05:30
kamidu
bb0920ef7f code reformatted to resolve the exsisted code formatting issues 2018-01-26 17:56:38 +05:30
kamidu
3bcb1b729c improve the java script code of changing the text and visibility 
Improved the logic in order to remove the unesssary text changes and visibility changes. and fix the code formatting issues found in the code.
 2018-01-26 17:56:38 +05:30
kamidu
9cc76da4c2 Fix git issue https://github.com/wso2/product-iots/issues/1629 
Fixes wso2/product-iots#1629
 2018-01-26 17:56:38 +05:30
WSO2 Builder
2cd3b81aaa [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare for next development iteration 2018-01-26 08:57:24 +00:00
WSO2 Builder
8301dda57d [WSO2 Release] [Jenkins #2888] [Release 3.0.215] prepare release v3.0.215 2018-01-26 08:57:10 +00:00
Rasika Perera
6c2f4e3c8d
Merge pull request #1165 from rasika/fix-1624 
Adding additional validations to improve stability of the product
 2018-01-26 14:14:30 +05:30
WSO2 Builder
6f6c3e2051 [maven-release-plugin] prepare for next development iteration 2018-01-26 06:54:56 +00:00
WSO2 Builder
a47115d92d [maven-release-plugin] prepare release v3.0.214 2018-01-26 06:54:41 +00:00
Rasika Perera
003ae9883b Fixing https://github.com/wso2/product-iots/issues/1629 2018-01-25 16:12:04 +05:30
charitha
3cf0d12181 Updated license year 2018-01-25 14:59:35 +05:30
charitha
c542c3efe9 Implemented operation response publishing to analytics 2018-01-25 14:52:32 +05:30
WSO2 Builder
b5ed177338 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare for next development iteration 2018-01-25 02:54:38 +00:00
WSO2 Builder
8569092e00 [WSO2 Release] [Jenkins #2878] [Release 3.0.212] prepare release v3.0.212 2018-01-25 02:54:22 +00:00
charitha
439fae4f8d Fixed https://github.com/wso2/product-iots/issues/1630 2018-01-24 22:53:50 +05:30
WSO2 Builder
d4a2b807aa [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare for next development iteration 2018-01-24 06:54:45 +00:00
WSO2 Builder
97324f8c19 [WSO2 Release] [Jenkins #2876] [Release 3.0.211] prepare release v3.0.211 2018-01-24 06:54:31 +00:00
Ruwan
16cd6056a9
Merge pull request #1167 from ruwany/master 
Fix for https://github.com/wso2/product-iots/issues/1399
 2018-01-24 12:07:46 +05:30
WSO2 Builder
b885931c26 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare for next development iteration 2018-01-24 05:53:23 +00:00
WSO2 Builder
e1a5b3ec43 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare release v3.0.210 2018-01-24 05:53:08 +00:00
Ace
bc9450b7ff merging with upstream 2018-01-24 10:53:00 +05:30
Ace
327f49cfd9 Fix for https://github.com/wso2/product-iots/issues/1399 2018-01-24 10:52:33 +05:30
Rasika Perera
ab352015b7 Fixes for the https://github.com/wso2/product-iots/issues/1624 2018-01-24 07:26:56 +05:30
Rasika Perera
8a09e44c3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624 2018-01-23 18:48:26 +05:30
WSO2 Builder
b428ecb931 [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare for next development iteration 2018-01-23 13:16:30 +00:00
WSO2 Builder
091da0326d [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare release v3.0.209 2018-01-23 13:16:15 +00:00
Rasika Perera
c5622c7b0b Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:35:10 +05:30
WSO2 Builder
45f778d2e4 Merge commit '774c20a09a0bb12b11dbec7c4ec9d5fb491575e2' into 1d9c0cda-191e-4c45-9fd9-32a2aa0808a4 2018-01-23 13:03:19 +00:00
WSO2 Builder
774c20a09a [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare for next development iteration 2018-01-23 12:48:12 +00:00
WSO2 Builder
4d35797a55 [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare release v3.0.208 2018-01-23 12:47:55 +00:00
Rasika Perera
f3860e42f7 Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:08:20 +05:30
Rasika Perera
5347930d95
Merge branch 'master' into fix-1623 2018-01-23 18:00:54 +05:30
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611 
Isolating Geo Location Enabling Configuration
 2018-01-23 17:59:57 +05:30
Rasika Perera
c46a2037fe Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 16:02:17 +05:30
Rasika Perera
68a5415e0b Fixing https://github.com/wso2/product-iots/issues/1623 2018-01-23 15:19:03 +05:30
Rasika Perera
3a9261536e Renamed isEnabled into Enabled for the consistency 2018-01-23 14:59:52 +05:30
Rasika Perera
08f4f04101 Fixing a typo 2018-01-23 14:39:33 +05:30
WSO2 Builder
8776317dfe [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare for next development iteration 2018-01-22 11:14:43 +00:00
WSO2 Builder
21c406fe01 [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare release v3.0.207 2018-01-22 11:14:29 +00:00
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
geethkokila
ca92c5029f Changing the variable name 2018-01-22 15:25:40 +05:30
geethkokila
a0a2817730 Changing the variable name 2018-01-22 15:19:24 +05:30
geethkokila
7c4ca89beb Removing extra lines 2018-01-22 15:13:43 +05:30
geethkokila
5c2c7dfc2a Removing commented lines 2018-01-22 15:11:29 +05:30
geethkokila
8f1d15c690 Removing commented lines 2018-01-22 15:10:47 +05:30
geethkokila
03570f3ad7 Improvements to policy monitoring framework 
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
 2018-01-22 14:39:29 +05:30
geethkokila
1a957666e3 Improvements to policy monitoring framework 
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
 2018-01-22 14:39:16 +05:30
WSO2 Builder
d8caf3baea [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare for next development iteration 2018-01-22 04:26:32 +00:00
WSO2 Builder
944d640d5f [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare release v3.0.206 2018-01-22 04:26:17 +00:00
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information (#1161) 
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information

* Modifications to the new activity info provider api

* Add acceptable activity list count validation

* Modifications to the new activity provider API resource

* Added license header to the test class

* Modifications to the new activity provider api
 2018-01-22 09:38:51 +05:30
nishadi
c50de8e2de Modified CommentsDAOmpl 
Removed concatenation.
 2018-01-18 16:33:04 +05:30
nishadi
a321bf934b Modified CommentsManagerImpl 
Reformatted.
 2018-01-18 16:26:40 +05:30
nishadi
40771cbfcd Modified CommentDAOImpl 
String sql change int constant.
 2018-01-18 16:21:18 +05:30
nishadi
8f8ec9a86a parameter in the consumes annotation changed to application/json 2018-01-18 15:56:38 +05:30
nishadi
eced883e7f Error response message changed. 2018-01-18 15:54:34 +05:30
nishadi
7242c63e60 CommentId changed into commentId 2018-01-18 14:54:15 +05:30
nishadi
27d3862ac8 CommentId changed into commentId 2018-01-18 14:42:40 +05:30
nishadi
3b86f8a443 CommentId changed into commentId 2018-01-18 14:16:48 +05:30
nishadi
da0b147050 modified commentsManagerImpl 
Reformatted.
 2018-01-18 13:31:21 +05:30
nishadi
f02a0b9e6c Modified pom.xml at org.wso2.carbon.device.application.mgt.common 
Extra dependency to "org.wso2.carbon.device.application.mgt.core" is removed.
 2018-01-18 11:32:32 +05:30
nishadi
4ea87284f2 Modified CommentAPIImpl 
Reformatted
 2018-01-18 11:17:05 +05:30
nishadi
a1868939a7 Modified CommentDAOImpl 
Reformatted
 2018-01-18 02:44:56 +05:30
nishadi
30ae09b067 Modified CommentDAOImpl 
Reformatted
 2018-01-18 02:42:57 +05:30
nishadi
c35ccf9888 Modified CommentManagerImpl 
Changed the messages of the Exceptions.
 2018-01-18 02:06:15 +05:30
nishadi
62ac3455dd Changed license year 2018-01-18 00:11:52 +05:30
nishadi
ff3eacd0ba Removed suppressing deprecated warning. 2018-01-18 00:06:41 +05:30
nishadi
a6f2486ec6 Modified Comment ManagementAPiImpl 
changed returning error response message into "return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();"
 2018-01-18 00:03:46 +05:30
nishadi
919a7a8ddd Modified pom.xml at org.wso2.carbon.device.application.mgt.api 
removed extra dependencies
 2018-01-17 17:27:18 +05:30
nishadi
4c1d8dfa4d Modified APIUtil 
Modified the osgi contexts and reformatted.
 2018-01-17 16:28:17 +05:30
WSO2 Builder
15bea25074 [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare for next development iteration 2018-01-17 10:53:13 +00:00
WSO2 Builder
f9484f286f [WSO2 Release] [Jenkins #2865] [Release 3.0.205] prepare release v3.0.205 2018-01-17 10:52:58 +00:00
WSO2 Builder
a4a1587cb3 Merge commit '955de2159ce36a8e784cd203466b5f8d9405e3ba' into b141a02b-f6a3-4cd5-b234-bea699286e00 2018-01-17 10:37:49 +00:00
nishadi
3cc15d0df0 Reformatted the code. 2018-01-17 16:06:41 +05:30
nishadi
3bfb2addbb Reformatted the code. 2018-01-17 15:58:01 +05:30
WSO2 Builder
955de2159c [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare for next development iteration 2018-01-17 10:13:09 +00:00
WSO2 Builder
d7c66d1d67 [WSO2 Release] [Jenkins #2864] [Release 3.0.204] prepare release v3.0.204 2018-01-17 10:12:51 +00:00
nishadi
1bbd0b1aa5 Modified CommentManagerImpl ,CommentManagementAPIImpl,CommentManagementAPI 
Modified the exceptions.
 2018-01-17 15:32:59 +05:30
Rasika Perera
67a12dc57b
Merge pull request #1158 from Kamidu/master 
validation improvements
 2018-01-17 15:32:28 +05:30
nishadi
c1dca737f7 Modified CommentManager 
Edited the comments.
 2018-01-17 15:16:29 +05:30
nishadi
3bd6d03b4c Modified CommentManagerImpl and CommentManager 
wrapped & thrown the sql and db exceptions with CommentManagementException and ApplicationManagementException.
 2018-01-17 15:13:22 +05:30
nishadi
caa47417bc Modified CommentManagerImpl 
removed catch (SQLException e) and catch (DBConnectionException e).
 2018-01-17 14:27:44 +05:30
Rasika Perera
6651dbb64a Fixed a typo 2018-01-17 14:07:00 +05:30
Rasika Perera
b24095779a Fixing https://github.com/wso2/product-iots/issues/1142 2018-01-17 13:51:18 +05:30
nishadi
74ea82c926 Modified CommentManagerImpl 
Renamed ApplicationManagementDAOFactory.getCommentDAO as commentDAO
 2018-01-17 13:36:42 +05:30
nishadi
a45ba625fe Renamed apAppCommentId into CommentId 2018-01-17 12:26:42 +05:30
kamidu
e086ecf28a correct olad formatting issues 2018-01-17 12:22:45 +05:30
nishadi
906535eb24 Modify CommentsManagerImpl 
Removed Not found Exception
 2018-01-17 11:51:32 +05:30
nishadi
4fb77cbee8 Modify CommentsManagerImpl 
Removed throwing NullPointerException;
 2018-01-17 11:45:14 +05:30
nishadi
a1911432a6 Modify PaginationConfiguration 
Removed commented codes.
 2018-01-17 11:32:50 +05:30
nishadi
99b916d6ff Modify Comment 
Removed commented codes.
 2018-01-17 11:30:02 +05:30
nishadi
453559a07b Modify CommentManagementAPIImpl 
returned Error Response.
 2018-01-17 11:24:54 +05:30
WSO2 Builder
4883a5779d [WSO2 Release] [Jenkins #2862] [Release 3.0.203] prepare for next development iteration 2018-01-17 05:51:08 +00:00
WSO2 Builder
4546e323cf [WSO2 Release] [Jenkins #2862] [Release 3.0.203] prepare release v3.0.203 2018-01-17 05:50:53 +00:00
nishadi
06059cacf1 Modify CommentManagementAPIImpl 
Removed the comment.
 2018-01-17 11:19:56 +05:30
nishadi
0f4e4ea483 Modify CommentManagementAPI 
add "defaultValue" parameter here in the ApiParams
 2018-01-17 11:18:24 +05:30
nishadi
7849d0938b Modify APIUtil 
change the format of imports.
 2018-01-17 11:09:39 +05:30
nishadi
a6434d918b Modify APIUtil 
change the format of imports.
 2018-01-17 11:07:11 +05:30
WSO2 Builder
eae50efeee [WSO2 Release] [Jenkins #2860] [Release 3.0.202] prepare for next development iteration 2018-01-17 03:07:14 +00:00
WSO2 Builder
6646a2f445 [WSO2 Release] [Jenkins #2860] [Release 3.0.202] prepare release v3.0.202 2018-01-17 03:07:00 +00:00
inoshperera
a49cdd9113
Merge pull request #1157 from inoshperera/master 
The device identity certificate's subject name has a hardcoded value
 2018-01-17 08:21:21 +05:30
kamidu
46d85a3833 removing console logs 2018-01-17 00:33:42 +05:30
kamidu
cdff923aab validation improvements 2018-01-16 18:46:38 +05:30
nishadi
5dce27e23b Adding CommentDAOImpl 
Implementation of CommentDAO interface.
 2018-01-16 16:40:21 +05:30
nishadi
7fb0faa2b8 Modify pom.xml at org.wso2.carbon.device.application.mgt.api 2018-01-16 16:36:01 +05:30
nishadi
f7caa02b81 Modify pom.xml at org.wso2.carbon.device.application.mgt.common 
Dependancy is added to org.wso2.carbon.device.application.mgt.core
 2018-01-16 16:33:52 +05:30
nishadi
819034f97d Adding Implementation of Comment Manager 2018-01-16 16:17:31 +05:30
nishadi
6b6a5bdbb1 Adding Comment Manager Interface 
Included the comment management methods and stars rating methods
 2018-01-16 16:15:53 +05:30
nishadi
64e8faa153 Adding CommentDAO Interface 2018-01-16 16:03:15 +05:30
nishadi
99857c9acc Modify Util 
validateCommentListPageSize method is added.
 2018-01-16 16:01:19 +05:30
nishadi
35e4174211 Modify Application Management DAO Factory 
getCommentDAO method is added.
 2018-01-16 16:00:02 +05:30
nishadi
5096654658 Adding Pagination Configuration for application-mgt 2018-01-16 15:56:34 +05:30
nishadi
87d1928f4c Modify Configuration Management 2018-01-16 15:55:51 +05:30
inoshperera
465e711242 https://github.com/wso2/product-iots/issues/1601 2018-01-16 15:55:23 +05:30
nishadi
9f44795682 Modify Configuration 
Pagination Configuration is added.
 2018-01-16 15:54:52 +05:30
nishadi
9f67e52741 Adding Pagination Result for application-mgt 2018-01-16 15:53:07 +05:30
nishadi
849474de87 Adding Pagination Request for application-mgt 2018-01-16 15:52:34 +05:30
nishadi
a0ef2dbafe Adding Comment 2018-01-16 15:51:18 +05:30
nishadi
c00345e7d7 Modify Application Release 
Variables are added- noOfRatedUsers and stars.
 2018-01-16 15:50:47 +05:30
nishadi
6dbdddb3d2 Adding Comment Manager Interface 
Included the comment management methods and stars rating methods
 2018-01-16 15:48:38 +05:30
nishadi
46f087f215 Adding Comment Management Exception 
Handle the Exceptions of Comment Management.
 2018-01-16 15:39:48 +05:30
nishadi
dbd9ad77ae Modified API Util 
getComment method is added to the APIUtil file.
 2018-01-16 15:37:03 +05:30
nishadi
b9bb6830f4 Adding Implementation of Comment Management API 2018-01-16 15:35:35 +05:30
nishadi
627aaab233 Adding Comment Management API 2018-01-16 15:35:03 +05:30
WSO2 Builder
086eeecb01 [WSO2 Release] [Jenkins #2858] [Release 3.0.201] prepare for next development iteration 2018-01-15 10:15:25 +00:00
WSO2 Builder
74d5a5b469 [WSO2 Release] [Jenkins #2858] [Release 3.0.201] prepare release v3.0.201 2018-01-15 10:15:11 +00:00
geethkokila
0e3069b0da Changing the generic application retrieval to get the application ids 
This fixes the issue caused due to retrieving the application details by submiting the device id, becasue at the first storing of the application, they are not stored agaist a device. It get's mapped later with the device. Hence it caused a null pointer
 2018-01-15 15:24:27 +05:30
WSO2 Builder
c57dec9f30 [WSO2 Release] [Jenkins #2856] [Release 3.0.200] prepare for next development iteration 2018-01-15 09:01:23 +00:00
WSO2 Builder
b51c9e9d4c [WSO2 Release] [Jenkins #2856] [Release 3.0.200] prepare release v3.0.200 2018-01-15 09:01:09 +00:00
geethkokila
b652d025c8 This commits fixes the issues of having the Application memory info and is-active flag with the DM_APPLICATION table, because those values should go to to DM_APPLICATION_MAPPING table. Change of the tables has happened. 2018-01-15 13:56:05 +05:30
lasantha
393d11630b resolve pom issues 2018-01-14 16:44:17 +05:30
WSO2 Builder
531f209b2c [WSO2 Release] [Jenkins #2854] [Release 3.0.199] prepare for next development iteration 2018-01-11 06:25:59 +00:00
WSO2 Builder
2415a8d7fa [WSO2 Release] [Jenkins #2854] [Release 3.0.199] prepare release v3.0.199 2018-01-11 06:25:44 +00:00
WSO2 Builder
ae743d0fbd [WSO2 Release] [Jenkins #2852] [Release 3.0.198] prepare for next development iteration 2018-01-10 08:33:28 +00:00
WSO2 Builder
7691579570 [WSO2 Release] [Jenkins #2852] [Release 3.0.198] prepare release v3.0.198 2018-01-10 08:33:14 +00:00
charitha
1c904e72f6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-01-10 13:50:00 +05:30
charitha
50269aacc6 Fixed https://github.com/wso2/product-iots/issues/1218 2018-01-10 13:34:09 +05:30
WSO2 Builder
ffedebe554 [WSO2 Release] [Jenkins #2850] [Release 3.0.197] prepare for next development iteration 2018-01-10 07:47:13 +00:00
WSO2 Builder
63ebfd7837 [WSO2 Release] [Jenkins #2850] [Release 3.0.197] prepare release v3.0.197 2018-01-10 07:46:58 +00:00
Ruwan
b6792f89f1
Merge pull request #1152 from ruwany/master 
Fixing https://github.com/wso2/product-iots/issues/1579
 2018-01-10 12:58:29 +05:30
Ace
e054a49aea Adding fix for https://github.com/wso2/product-iots/issues/1579 2018-01-10 12:26:52 +05:30
WSO2 Builder
8531895e67 [WSO2 Release] [Jenkins #2848] [Release 3.0.196] prepare for next development iteration 2018-01-10 02:17:21 +00:00
WSO2 Builder
c5e9ae3c1a [WSO2 Release] [Jenkins #2848] [Release 3.0.196] prepare release v3.0.196 2018-01-10 02:17:06 +00:00
Rasika Perera
ca0089b49e https://github.com/wso2/product-iots/issues/1573 Removed android-web-agent, Fixed download URL 2018-01-09 20:06:50 +05:30
WSO2 Builder
17abcc8192 [WSO2 Release] [Jenkins #2846] [Release 3.0.195] prepare for next development iteration 2018-01-09 10:22:08 +00:00
WSO2 Builder
c4dfe974f1 [WSO2 Release] [Jenkins #2846] [Release 3.0.195] prepare release v3.0.195 2018-01-09 10:21:51 +00:00
WSO2 Builder
e08669a51d Merge commit 'becdfba15e826cf60eb64a8400cdb9b3ff58ec4d' into 2df7da8d-e5ad-4a38-9c5e-0a2f0d200522 2018-01-09 10:06:07 +00:00
WSO2 Builder
becdfba15e [WSO2 Release] [Jenkins #2845] [Release 3.0.194] prepare for next development iteration 2018-01-09 09:45:57 +00:00
WSO2 Builder
b70504bc8b [WSO2 Release] [Jenkins #2845] [Release 3.0.194] prepare release v3.0.194 2018-01-09 09:45:38 +00:00
Rasika Perera
8997b4ba53
Merge pull request #1150 from rasika/fix-1547 
Fixing https://github.com/wso2/product-iots/issues/1547
 2018-01-09 15:08:55 +05:30
Ruwan
c6c068fad2
Merge pull request #1149 from inoshperera/master 
Improvement on the basic auth handling
 2018-01-09 15:01:24 +05:30
Rasika Perera
4770b9b603 Fixing https://github.com/wso2/product-iots/issues/1547 2018-01-09 14:52:48 +05:30
inoshperera
28eb239179 upgrading the json version and documenting the usage of the basicAuth paramater. 2018-01-09 14:51:23 +05:30
WSO2 Builder
36d1839ce2 [WSO2 Release] [Jenkins #2843] [Release 3.0.193] prepare for next development iteration 2018-01-09 08:43:08 +00:00
WSO2 Builder
a67433442e [WSO2 Release] [Jenkins #2843] [Release 3.0.193] prepare release v3.0.193 2018-01-09 08:42:54 +00:00
Rasika Perera
83ae57a044
Merge pull request #1147 from rasika/fix-1553 
Fixing cannot publish policies without enrolling a device
 2018-01-09 13:58:24 +05:30
inoshperera
0485e9c2b3 Fixes https://github.com/wso2/product-iots/issues/1570 2018-01-08 17:57:44 +05:30
WSO2 Builder
8d26327a9d [WSO2 Release] [Jenkins #2841] [Release 3.0.192] prepare for next development iteration 2018-01-04 17:13:30 +00:00
WSO2 Builder
4d16377ddf [WSO2 Release] [Jenkins #2841] [Release 3.0.192] prepare release v3.0.192 2018-01-04 17:13:14 +00:00
kamidu
09f395660a Fixing the DAO layer acess to maintain the consistancy on implimentation 2018-01-04 12:38:17 +05:30
Rasika Perera
e254d4ccc8 Fixing https://github.com/wso2/product-iots/issues/1553 and https://github.com/wso2/product-iots/issues/1546 2018-01-04 00:29:23 +05:30
kamidu
6daf95b78d Change the config placement for improve the separatability 2018-01-03 16:27:09 +05:30
kamidu
33b27234a0 Enable the new configuration for testing 2018-01-03 15:03:08 +05:30
lasantha
486aac1cdc adding application release creation functioanlity (NC) 2018-01-01 00:53:43 +05:30
lasantha
f8c5ff95b9 Device API layer into two sections. named as store and publisher 2017-12-29 15:01:38 +05:30
kamidu
2505d4907a Fixing https://github.com/wso2/product-iots/issues/1565 2017-12-29 10:37:57 +05:30
lasantha
05b1221641 increase version 2017-12-25 07:30:05 +05:30
lasantha
667f997f34 merging with master branch 2017-12-24 14:19:50 +05:30
lasantha
11ea50e8ab Adding AP improvements(incomplete) 2017-12-24 13:58:41 +05:30
WSO2 Builder
5783a74110 [WSO2 Release] [Jenkins #2838] [Release 3.0.191] prepare for next development iteration 2017-12-22 06:19:13 +00:00
WSO2 Builder
7a7613a0cb [WSO2 Release] [Jenkins #2838] [Release 3.0.191] prepare release v3.0.191 2017-12-22 06:18:57 +00:00
Ace
42f36e5a9a Fixing test failure 2017-12-22 11:12:48 +05:30
Rasika Perera
7b8ba259e4
Merge pull request #1134 from madhawap/vf-dev-3 
Added an API to filter activities by operation code
 2017-12-21 18:43:17 +05:30
Madawa Soysa
e786fa410b Checking if the user store manager class is a sub class of the default 
This commit is to modify the current logic which checks if the UserStoreManager class is equal to the JDBCUserStoreManager class to support subclasses of the JDBCUserStoreManager class to return correct total user count.

In this commit, instead of comparing the string name, tests the UserStoreManager instance is a type of JDBCUserStoreManager.

Resolves wso2/product-iots#1556
 2017-12-21 17:06:28 +05:30
Kamidu Sachith Punchihewa
d397d73777
Merge pull request #1139 from rasika/fix-1544 
Fixing devicemgt roles not created for newly created tenants
 2017-12-19 12:07:49 +05:30
Kamidu Sachith Punchihewa
48e67df534
Merge pull request #1141 from ruwany/master 
Notification center enhancements
 2017-12-19 11:47:43 +05:30
Ace
e2ce619166 Adding UI enhancements and including unit tests 2017-12-19 11:16:55 +05:30
WSO2 Builder
b8643213b6 [WSO2 Release] [Jenkins #2831] [Release 3.0.190] prepare for next development iteration 2017-12-18 16:17:54 +00:00
WSO2 Builder
34dc4038e6 [WSO2 Release] [Jenkins #2831] [Release 3.0.190] prepare release v3.0.190 2017-12-18 16:17:39 +00:00
kamidu
049c6bcdae Enaled policy description on effective policy view 2017-12-18 20:59:09 +05:30
Rasika Perera
08e40d3989 Fixing error log 2017-12-18 17:04:36 +05:30
Rasika Perera
2e7bd0626d Fixing https://github.com/wso2/product-iots/issues/1544 2017-12-18 16:57:03 +05:30
Ace
fb6c98b969 Restricting clear notifications to tenant domain only 2017-12-18 12:43:37 +05:30
Ace
15991f626d Adding clear notifications button to notification listing page 2017-12-18 11:14:02 +05:30
Ace
29c0692286 removing un-necessary logs 2017-12-16 11:29:10 +05:30
Ace
c506d90698 removing un-necessary logs 2017-12-16 11:27:28 +05:30
Ace
9ac89d1ebe merging with upstream 2017-12-16 10:03:28 +05:30
Ace
855f294ed2 improving notifications management 2017-12-16 10:03:02 +05:30
Madawa Soysa
6fed9f7823 Changing the order by parameter when getNextPendingOperation called 
Changing the order by parameter to UPDATED_TIMESTAMP.

Resolves wso2/product-iots#1539
 2017-12-16 09:49:20 +05:30
WSO2 Builder
2a01c77ef9 [WSO2 Release] [Jenkins #2827] [Release 3.0.189] prepare for next development iteration 2017-12-15 12:11:35 +00:00
WSO2 Builder
ce604ed214 [WSO2 Release] [Jenkins #2827] [Release 3.0.189] prepare release v3.0.189 2017-12-15 12:11:21 +00:00
lasantha
1a8816f531 fixed build failure 2017-12-15 16:25:12 +05:30
Madawa Soysa
8df3999cbc
Merge pull request #1135 from Kamidu/master 
Enable roles containing the filter to be listed in role listing
 2017-12-15 14:55:04 +05:30
Madawa Soysa
30da164121
Merge pull request #1136 from lasanthaDLPDS/vf-dev-api 
Adding v0.9 API version for device management and certificate management
 2017-12-15 14:38:34 +05:30
lasantha
11310a9145 default API set to newly added API and fixed it by using context parameters 2017-12-15 10:21:15 +05:30
kamidu
e10cf66813 Enable roles containing the filter to be listed in role listing 2017-12-14 19:18:44 +05:30
WSO2 Builder
5262f516f4 [WSO2 Release] [Jenkins #2822] [Release 3.0.188] prepare for next development iteration 2017-12-14 12:11:12 +00:00
WSO2 Builder
2bfe4bbfe7 [WSO2 Release] [Jenkins #2822] [Release 3.0.188] prepare release v3.0.188 2017-12-14 12:10:58 +00:00
madhawap
16f70454ad Added an API to filter activities by operation code 2017-12-14 14:44:53 +05:30
kamidu
1413ff5268 Fixing https://github.com/wso2/product-iots/issues/1526 2017-12-14 14:43:28 +05:30
WSO2 Builder
3ce2d1c3b2 [WSO2 Release] [Jenkins #2820] [Release 3.0.187] prepare for next development iteration 2017-12-13 09:02:53 +00:00
WSO2 Builder
ae71fafc10 [WSO2 Release] [Jenkins #2820] [Release 3.0.187] prepare release v3.0.187 2017-12-13 09:02:38 +00:00
Rasika Perera
0a9ecd3100
Merge pull request #1132 from ruwany/master 
Fix for https://github.com/wso2/product-iots/issues/1525
 2017-12-13 14:06:34 +05:30
Ace
1472cf6e27 Merging with upstream 2017-12-13 14:06:20 +05:30
Ace
aa654ea5bf Fix for https://github.com/wso2/product-iots/issues/1525 2017-12-13 14:02:34 +05:30
charitha
7ab31ae7d8 Fixed https://github.com/wso2/product-iots/issues/1523 2017-12-13 13:56:29 +05:30
WSO2 Builder
6fe5b6909f [WSO2 Release] [Jenkins #2818] [Release 3.0.186] prepare for next development iteration 2017-12-13 04:14:53 +00:00
WSO2 Builder
ff97ffbfcc [WSO2 Release] [Jenkins #2818] [Release 3.0.186] prepare release v3.0.186 2017-12-13 04:14:39 +00:00
Ace
e06d8f9e13 merging with upstream 2017-12-13 00:25:22 +05:30
Ace
62c6882fa2 Fixing server startup issue when configured with PostgreSQL DB 2017-12-13 00:23:08 +05:30
lasantha
9a7745d915 Adding new API version for backward compatibility 2017-12-12 18:20:37 +05:30
WSO2 Builder
689373a58f [WSO2 Release] [Jenkins #2816] [Release 3.0.185] prepare for next development iteration 2017-12-12 08:11:10 +00:00
WSO2 Builder
babc4a9e9a [WSO2 Release] [Jenkins #2816] [Release 3.0.185] prepare release v3.0.185 2017-12-12 08:10:56 +00:00
charitha
2bb12deb9c Fixed https://github.com/wso2/product-iots/issues/1511 2017-12-12 13:09:04 +05:30
lasantha
c21ddceae1 adding application and release management implementation 2017-12-06 15:15:07 +05:30
WSO2 Builder
5e70f5f469 [WSO2 Release] [Jenkins #2814] [Release 3.0.184] prepare for next development iteration 2017-11-30 04:41:07 +00:00
WSO2 Builder
304e942c31 [WSO2 Release] [Jenkins #2814] [Release 3.0.184] prepare release v3.0.184 2017-11-30 04:40:52 +00:00
Ruwan
88ac37b767
Merge pull request #1126 from lasanthaDLPDS/master 
Adding new API endpoints
 2017-11-30 09:43:09 +05:30
Ruwan
33c58ac518
Merge pull request #1125 from Gathika94/add-emm-analytics 
Unit Tests for getGeoDevicesLocations API
 2017-11-30 09:41:26 +05:30
WSO2 Builder
ce4b03eed4 [WSO2 Release] [Jenkins #2812] [Release 3.0.183] prepare for next development iteration 2017-11-29 15:52:09 +00:00
WSO2 Builder
28195c7f77 [WSO2 Release] [Jenkins #2812] [Release 3.0.183] prepare release v3.0.183 2017-11-29 15:51:55 +00:00
sameera910409
c8d56f66ea added update device properties functionality for device types 2017-11-29 19:33:51 +05:30
lasantha
aa4f7c13c5 Fixing issue in get device API 2017-11-29 10:05:50 +05:30
Gathika94
d67877cfb1 unit tests for geo device locations api- minor changes 2017-11-28 20:26:03 +05:30
Gathika94
5308108899 unit tests- minor changes 2017-11-28 20:22:40 +05:30
Gathika94
fd5ada61af unit tests for geo device locations api 2017-11-28 20:18:05 +05:30
lasantha
fe576c0aac Adding required API endpoints to mograte from prior verisons of IoTS 3.1.0 to IoTS 3.1.0 2017-11-28 10:51:52 +05:30
WSO2 Builder
6603015614 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare for next development iteration 2017-11-23 11:38:00 +00:00
WSO2 Builder
bb731cb264 [WSO2 Release] [Jenkins #2808] [Release 3.0.182] prepare release v3.0.182 2017-11-23 11:37:44 +00:00
charitha
6cb3ffa3ca Fixed build failure due to incorrect class name 2017-11-23 16:40:53 +05:30
charitha
3c23a3cf5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-11-23 16:33:28 +05:30
charitha
1449698a3c OSGi improvement to #977 2017-11-23 16:33:14 +05:30
Gathika94
7a2fc90a15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics 2017-11-23 15:58:17 +05:30
Gathika94
c22a7f1882 minor ui changes 2017-11-23 15:57:54 +05:30
lasantha
1c6393959d adding app manager changes - not complete 2017-11-23 12:57:28 +05:30
Gathika94
356063a247 removed warnings created in geo deivice locations dashboard 2017-11-23 10:51:22 +05:30
WSO2 Builder
b2fc6b4cad [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare for next development iteration 2017-11-23 05:14:07 +00:00
WSO2 Builder
a55619b333 [WSO2 Release] [Jenkins #2805] [Release 3.0.181] prepare release v3.0.181 2017-11-23 05:13:51 +00:00
Gathika94
89eff7b7bd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics 2017-11-23 10:25:19 +05:30
Gathika94
81b036678a minor changes in device locations UI 2017-11-23 10:22:31 +05:30
WSO2 Builder
3d522e7c62 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare for next development iteration 2017-11-23 04:38:38 +00:00
WSO2 Builder
08382cc965 [WSO2 Release] [Jenkins #2804] [Release 3.0.180] prepare release v3.0.180 2017-11-23 04:38:24 +00:00
Charitha Goonetilleke
61f88b54ff
Merge pull request #1122 from warunalakshitha/remote-control 
Add remote control configurations as remove unused methods
 2017-11-23 09:40:11 +05:30
Gathika94
cec1e1393e removed unnecessary files 2017-11-22 23:34:08 +05:30
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
lasantha
460bda420b adding role restriction DAO layer implementation 2017-11-22 14:52:19 +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
lasantha
d196e3e0e1 Adding DAO layer changes 2017-11-22 01:14:18 +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
Ruwan
70ab17acde
Merge pull request #1068 from Jasintha/devicePolicyServiceTestImprovement 
Device policy service test improvement
 2017-11-17 12:01:51 +05:30
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
Ruwan
cac80fc270
Merge pull request #1087 from Kamidu/application-mgt 
changing the sso config for store jag application
 2017-11-17 10:53:40 +05:30
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
e99f6ba481
Merge pull request #1081 from menakaj/application-mgt 
Fixing code formatting issues
 2017-11-17 10:12:45 +05:30
Ruwan
357a625b0b
Merge pull request #1089 from rasika/master 
Adding unit tests for monitoring manager
 2017-11-17 10:11:34 +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
lasantha
45c668ecce adding DAO methods for pplication management 2017-11-17 07:11:44 +05:30
lasantha
81be917e10 adding application registrating functionality and partial DAO modefications 2017-11-15 16:47:21 +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
Madawa Soysa
72a09bf90b This commit fixes the unable to parse the DN issue 
Currently when a DN cannot be parsed if the DN is not in RFC2253 format. This commit fixeds this issue.
 2017-11-12 18:31:21 +05:30
lasantha
dc6ab1db2f resolved issues and resolved merge conflicts with master branch 2017-11-08 10:57:03 +05:30
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
33345f5b52 Adding missing import 2017-11-02 14:42:08 +05:30
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
Rasika Perera
fc83d02ce8 Adding unit tests for monitoring manager 2017-10-30 14:43:06 +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
kamidu
6f2f98545d changing the sso config for store 2017-10-26 18:58:21 +05:30
lasantha
f4c3a0b124 Remove unnecessary pages and units 2017-10-25 18:14:18 +05:30
lasantha
ede7680b40 Fixed build failure 2017-10-25 16:44:23 +05:30
Kamidu Sachith Punchihewa
17bce6fed1 Adding the store user interface. (#1084) 2017-10-25 16:27:55 +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
Menaka Jayawardena
5756fa1519 Fixing code formatting issues in Platform related components. 2017-10-23 12:27:03 +05:30
Menaka Jayawardena
73e820b78e Fixing code formatting issues in DataTable components. 2017-10-23 12:26:24 +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
Megala Uthayakumar
8aa3a9472c Merge pull request #1078 from GDLMadushanka/master 
Unit tests for MQTTPushNotificationProvider
 2017-10-20 12:37:47 +05:30
GDLMadushanka
cf90b6315a Adding unit test to pom 2017-10-20 12:35:37 +05:30
GDLMadushanka
2f18c199a6 required changes for pr 2017-10-20 12:23:10 +05:30
GDLMadushanka
122a045056 refactoring 2017-10-20 12:10:16 +05:30
GDLMadushanka
f561c5d5e2 Unit tests for mqtt push notification provider 2017-10-20 12:03:16 +05:30
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
Amal Gunatilake
30ce5b1404 Merge pull request #1071 from amalhub/master 
Adding tests for org.wso2.carbon.identity.jwt.client.extension
 2017-10-17 18:43:21 +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
megala21
b6c40cfa69 Merge remote-tracking branch 'upstream/master' into wso2master 2017-10-17 09:38:55 +05:30
megala21
ab54dda56c Refactoring 2017-10-17 09:36:59 +05:30
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
megala21
75bb02ac4a Refactoring 2017-10-16 17:13:43 +05:30
megala21
80c1a8c8ca Adding some more test cases 2017-10-16 17:08:42 +05:30
amalhub
e430efe43b Updating license year 2017-10-16 15:34:44 +05:30
amalhub
4dced1f0ef Adding tests for org.wso2.carbon.identity.jwt.client.extension 2017-10-16 15:23:28 +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
Madawa Soysa
e50d7bc5d8 Merge pull request #1069 from rasika/feature-manger-unit-tests 
Adding Unit Tests for the Feature Manger
 2017-10-15 10:07:39 +05:30
Rasika Perera
685a5c076d Added few more unit tests for the feature manager 2017-10-15 09:45:23 +05:30
Rasika Perera
15885da9f9 Removed redundant rollbackTransaction causing IllegalStateException 2017-10-15 09:44:56 +05:30
Rasika Perera
5ba6fb90f5 Removed redundant rollbackTransaction causing IllegalStateException 2017-10-15 09:44:46 +05:30
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
Jasintha
5cc58b51e8 refactoring 2017-10-14 12:41:55 +05:30
Jasintha
2848045288 Coverting Exception paths of methods 2017-10-14 12:36:11 +05:30