WSO2 Builder
5d55413e02
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare release v2.0.22
2017-03-10 13:08:55 +05:30
WSO2 Builder
ae3300afde
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare for next development iteration
2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare release v2.0.21
2017-03-09 13:14:38 +05:30
WSO2 Builder
21cdcdd21a
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare for next development iteration
2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare release v2.0.20
2017-03-09 12:37:49 +05:30
WSO2 Builder
13bb9aebf7
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare for next development iteration
2017-02-28 15:08:01 +05:30
WSO2 Builder
937d283052
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare release v2.0.19
2017-02-28 15:07:51 +05:30
WSO2 Builder
93258c598d
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare for next development iteration
2017-02-19 18:04:13 +05:30
WSO2 Builder
2da8898755
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare release v2.0.18
2017-02-19 18:04:00 +05:30
WSO2 Builder
b051bd108b
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
2017-02-06 22:57:33 +05:30
WSO2 Builder
ce78ac277e
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
2017-02-06 22:57:23 +05:30
WSO2 Builder
c954731870
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
2017-02-06 12:15:58 +05:30
WSO2 Builder
e68c3d170b
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
2017-02-06 12:15:44 +05:30
WSO2 Builder
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
2017-02-03 16:08:12 +05:30
WSO2 Builder
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
2017-02-02 15:56:36 +05:30
WSO2 Builder
5dc55bb5b5
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare for next development iteration
2017-01-30 16:05:41 +05:30
WSO2 Builder
c7fe9c3a20
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare release v2.0.13
2017-01-30 16:05:29 +05:30
WSO2 Builder
c17bead1fc
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare for next development iteration
2017-01-29 19:46:03 +05:30
WSO2 Builder
14100d3cc8
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare release v2.0.12
2017-01-29 19:45:51 +05:30
WSO2 Builder
cd7e0feaa6
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare for next development iteration
2017-01-24 23:22:44 +05:30
WSO2 Builder
abb150d9bd
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare release v2.0.11
2017-01-24 23:22:33 +05:30
WSO2 Builder
002fb8719b
[maven-release-plugin] prepare for next development iteration
2017-01-23 20:24:47 +00:00
WSO2 Builder
04f32902fd
[maven-release-plugin] prepare release v2.0.10
2017-01-23 20:21:44 +00:00
WSO2 Builder
5c207897ad
[maven-release-plugin] prepare for next development iteration
2017-01-20 12:44:14 +00:00
WSO2 Builder
233d14edbd
[maven-release-plugin] prepare release v2.0.9
2017-01-20 12:41:33 +00:00
WSO2 Builder
eedecf00ed
[maven-release-plugin] prepare for next development iteration
2017-01-19 23:23:04 +00:00
WSO2 Builder
ef57fc463b
[maven-release-plugin] prepare release v2.0.8
2017-01-19 23:20:20 +00:00
WSO2 Builder
585b9bde4d
[maven-release-plugin] prepare for next development iteration
2017-01-14 01:50:45 +00:00
WSO2 Builder
d206148841
[maven-release-plugin] prepare release v2.0.7
2017-01-14 01:46:41 +00:00
WSO2 Builder
5411d93103
[maven-release-plugin] prepare for next development iteration
2017-01-07 07:48:36 +00:00
WSO2 Builder
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
2017-01-07 07:33:45 +00:00
ayyoob
20c3940ca4
made MonitoringTask to get config from device management service
2017-01-05 22:06:11 +05:30
ayyoob
db2ddc7bed
policy manager refactored to support tenancy
2017-01-05 12:24:41 +05:30
WSO2 Builder
6aea6195e9
[maven-release-plugin] prepare for next development iteration
2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
2016-12-23 19:18:26 +00:00
WSO2 Builder
ed47094964
[maven-release-plugin] prepare for next development iteration
2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248
[maven-release-plugin] prepare release v2.0.4
2016-12-23 07:00:40 +00:00
Ruwan
7619eabc87
Merge pull request #495 from rasika/release-2.0.x
...
IOTS-325: Fixing cannot delete a policy associated with a group
2016-12-22 11:01:08 +05:30
Rasika Perera
4cd2b94303
IOTS-325: Fixing cannot delete a policy associated with a group
2016-12-22 10:58:54 +05:30
Supun94
a831dc6a9a
Changing cdm-config file
2016-12-19 16:19:36 +05:30
Supun94
09572a9977
Removed redundant classes
2016-12-19 16:19:36 +05:30
Supun94
89410dfae4
Changing getEffectiveFeatures method
2016-12-19 16:19:36 +05:30
Supun94
d82a70f841
Changing simple policy decision point
2016-12-19 16:19:36 +05:30
Supun94
2751d4b856
Code refactoring
2016-12-19 16:19:36 +05:30
Supun94
eb1575126f
Minor refactoring on policy merging
2016-12-19 16:19:36 +05:30
Supun94
451b2fd1dc
Minor refactoring on policy evaluation
2016-12-19 16:19:36 +05:30
Supun94
02fb952cc0
Minor refactoring on policy decision point
2016-12-19 16:19:36 +05:30
Supun94
35f3fcc8f9
Changed policy evaluation point
2016-12-19 16:19:36 +05:30
Supun94
62acc2ebf2
Adding merged policy evaluation service component
2016-12-19 16:19:36 +05:30
Supun94
6565e14051
Adding simple policy evaluation decision point
2016-12-19 16:19:36 +05:30
Supun94
936e71a743
Adding configurations for different policy evaluation service components
2016-12-19 16:19:36 +05:30
Supun94
272ba7b012
Changed getEffectiveFeatures method
2016-12-19 16:19:36 +05:30
Supun94
367fa927b0
Changed policy decision point package structure
2016-12-19 16:19:36 +05:30
Supun94
652d776672
Adding effective policy details
2016-12-19 16:19:36 +05:30
Supun94
33b79dcbba
Adding effective policy service
2016-12-19 16:19:36 +05:30
Supun94
c91da9219d
fixed policy conflicts
2016-12-19 16:19:36 +05:30
Supun94
cc5d9012c1
Created simple evaluation point
2016-12-19 16:19:36 +05:30
Supun94
21bc812281
Minor refactoring on Policy Eval service comp
2016-12-19 16:19:36 +05:30
Rasika Perera
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
2016-12-19 12:39:56 +05:30
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
2016-12-19 08:45:19 +05:30
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
2016-12-16 17:03:06 +05:30
geethkokila
2b7d5fd66b
Fixing the null pointer issue in policy manager
2016-12-15 10:57:48 +05:30
WSO2 Builder
a59edee410
[maven-release-plugin] prepare for next development iteration
2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
2016-12-08 14:37:11 +00:00
geethkokila
d911281ad1
Merging master branch with release-2.0.x
2016-12-08 12:34:50 +05:30
WSO2 Builder
228b24ca79
[maven-release-plugin] prepare for next development iteration
2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
2016-12-01 12:10:10 +00:00
geethkokila
20ca76640d
Adding changes for the grouping and ownership changes
2016-12-01 16:35:59 +05:30
geethkokila
0879a75f7b
Fixing the serializing issue of device groups.
2016-11-30 17:46:01 +05:30
WSO2 Builder
8431b30ddc
[maven-release-plugin] prepare for next development iteration
2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
2016-11-25 07:43:34 +00:00
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
2016-11-16 12:16:25 +00:00
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
2016-11-16 13:32:13 +05:30
charitha
ac30e7eb3e
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
2016-10-31 10:32:11 +00:00
charitha
1bfba25c5e
Remove user list and role list attributes from group object
...
Move group components to same devicemgt package levels
2016-10-26 17:51:38 +05:30
charitha
5f68953b11
Merge branch 'master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
2016-10-25 14:22:44 +05:30
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
2016-10-18 12:09:16 +00:00
harshanl
370f6de260
Removed applied policy upon removal of the last policy applicable for a device
2016-10-18 17:10:34 +05:30
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
2016-10-17 14:13:25 +00:00
harshanl
036ed6fe41
Added POLICY_REVOKE operation upon deletion of the last policy
2016-10-14 19:20:11 +05:30
harshanl
73539362d4
Refactored PolicyAdministratorPointImpl
2016-10-14 17:33:41 +05:30
harshanl
6e1fdabaad
EMM-1342:Added policy revoke operation
2016-10-14 17:13:43 +05:30
harshanl
24c38602b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 17:11:42 +05:30
harshanl
51910ee67a
EMM-1675:Added policy revoke operation
2016-10-13 17:11:36 +05:30
susinda
ca68181541
Fixing NPE of EMM-1715
2016-10-13 12:11:37 +05:30
hasuniea
2128f08658
fixing EMM-1750
2016-10-13 10:00:08 +05:30
kamidu
2f852d84f4
Fix for the issue : EMM policy updating issue
2016-10-10 16:37:37 +05:30
charitha
670ca7c228
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
2016-10-10 15:29:10 +05:30
harshanl
4bcf350236
EMM-1678:Updated the oauth component versions
2016-10-06 19:43:23 +05:30
charitha
f22d392978
Upgrade to comply with latest CDMF changes
2016-10-04 19:03:07 +05:30
harshanl
f9ba45f439
Fixed the device status changing issue when there are multiple enrollments for the same device
2016-09-30 11:04:28 +05:30
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
2016-09-29 20:32:59 +05:30
harshanl
f24242fb8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-23 21:17:50 +05:30
harshanl
dd03d0b740
Added device status change upon inactivity mechanism
2016-09-23 21:17:37 +05:30
Ruwan
0c92f80e68
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
...
Migrating kernel/apim/appm/identity to latest versions
2016-09-23 17:04:18 +05:30
harshanl
1b6c7ea502
Refactored PolcyMgt component
2016-09-22 20:30:18 +05:30
Ace
154a6082ce
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
...
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30
harshanl
108ea98677
Refactor policy mgt components and fixed add operations for invalid devices from task service
2016-09-21 19:44:46 +05:30
harshanl
c967fc34d0
Fixed EMM-1513
2016-09-20 18:43:50 +05:30
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
2016-09-19 18:54:38 +05:30
Ace
6a8a5cbd5a
Merging with master
2016-09-19 12:21:41 +05:30
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
2016-09-09 20:18:12 +05:30
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-09-09 18:42:46 +05:30
harshanl
671ef77b63
Fixed EMM-1107 issue
2016-09-09 18:25:28 +05:30
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
2016-09-09 17:10:04 +05:30
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
2016-08-18 22:09:33 +05:30
hasuniea
6db619317c
fixing app-install issue
2016-08-17 15:29:51 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
Ace
07b12fe4ea
Bug fixes
2016-07-26 22:03:14 +05:30
Ace
ca8859c80a
Fixing broken build due to new javax.xml imports
2016-07-18 09:09:29 +05:30
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
2016-07-15 16:25:31 +02:00
Timo Briddigkeit
0ac4752b2b
Fixed null pointer dereference
2016-07-15 09:47:08 +02:00
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
2016-07-13 15:02:11 +02:00
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
2016-07-08 19:09:55 +05:30
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
2016-07-07 13:10:19 +05:30
Chatura Dilan
2befefc967
Added OS build date
2016-07-01 15:45:59 +05:30
prabathabey
be7e63c390
merging rest-api-improvements branch to master
2016-06-30 16:40:15 +05:30
Chatura Dilan
24b462f4f4
Added is-active field to the Application
2016-06-29 17:41:45 +05:30
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
2016-06-27 16:28:49 +05:30
geethkokila
1fabb0eee3
Fixing the database syncing issue
2016-06-07 12:55:15 +05:30
prabathabey
b24250f3f2
Returning device info within the device bean itself
2016-06-02 20:49:23 +05:30
prabathabey
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
2016-05-30 16:40:57 +05:30
prabathabey
726a700528
Improving error handling in checking for monitoring frquency
2016-05-30 11:45:02 +05:30
prabathabey
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
2016-05-30 08:21:59 +05:30
prabathabey
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
2016-05-25 17:37:21 +05:30
inosh
1341884957
resolving conflicts
2016-05-23 14:14:05 +05:30
inosh
60b42715d6
syncing admin api from product emm
2016-05-23 14:11:25 +05:30
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
2016-05-20 16:43:16 +05:30
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
2016-05-20 16:43:02 +05:30
prabathabey
a375252a94
Adding pluggable push notification framework
2016-05-19 00:20:45 +05:30
Madhawa Perera
94aacb1625
Adding swagger annotations to beans
2016-05-13 02:38:10 +05:30
Madhawa Perera
5d1bf67630
Adding swagger annotations to beans
2016-05-13 01:31:33 +05:30
Madhawa Perera
087adafeb7
Adding swagger annotations to beans
2016-05-13 01:25:29 +05:30
geethkokila
3396a5066d
Adding changes for the updated time of device info and device location
2016-04-29 22:30:07 +05:30
geethkokila
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 10:26:51 +05:30
geethkokila
2fb42518b6
Adding the changes for the device group with policy.
2016-04-27 10:26:47 +05:30
prabathabey
9068a3d893
Fixing compilation failures caused due to API changes
2016-04-26 16:40:30 +05:30
geethkokila
4cf37bb16c
Fixing the compilation error on the proprietory plugins.
2016-04-24 08:54:31 +05:30
dilanua
ce8d4b53a2
Adding temporary development code bits of dashboard analytics feature
2016-04-08 15:10:01 +05:30
ayyoob
c45895685b
Added device type multi tenancy capability.
2016-03-29 11:40:58 +05:30
geethkokila
e9da24c9e8
Changing the snapshot versions from 1.0.4 to 1.1.0
2016-03-24 11:41:52 +05:30
geethkokila
41191d6df0
Adding the search feature to device mgt plugin
2016-03-21 10:33:35 +05:30
geethkokila
e0e0a57c11
[maven-release-plugin] prepare for next development iteration
2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712
[maven-release-plugin] prepare release v1.0.3
2016-01-05 18:15:28 +05:30
geethkokila
e66d291947
[maven-release-plugin] prepare for next development iteration
2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75
[maven-release-plugin] prepare release v1.0.2
2015-12-30 14:18:57 +05:30
geethkokila
d0a2c5521c
Commenting this due to policy compliance warn will block the device
2015-12-24 11:09:32 +05:30
geethkokila
185a59fbd4
[maven-release-plugin] prepare for next development iteration
2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b
[maven-release-plugin] prepare release v1.0.1
2015-12-23 22:39:20 +05:30
harshanl
402b843e5d
Updated task schedule service to fix EMM-1145, EMM-1100
2015-12-23 19:35:50 +05:30
prabathabey
7a27e88551
Changing the log levels configured in log4j.properties files used as part of test configurations
2015-12-22 22:43:26 +05:30
geethkokila
4e9255fbc9
[maven-release-plugin] prepare for next development iteration
2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34
[maven-release-plugin] prepare release v1.0.0
2015-12-22 08:28:33 +05:30
pasinduj
ddefa19e0f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-17 09:41:19 +05:30
Kasun Delgolla
d5f87f4dc1
Committing policy compliance monitoring issue
2015-12-16 14:38:32 +05:30
pasinduj
9a50455a29
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-14 08:57:36 +05:30
harshanl
00cf61c44c
Fixed EMM-1069 and refactore DCR services
2015-12-11 20:04:22 +05:30
pasinduj
f49f13501f
modified dbscripts removing policy ID forigen key from one table
2015-12-08 15:35:01 +05:30
pasinduj
a390df68ec
modified dbscripts to remove foriegn key reference
2015-12-08 11:42:04 +05:30
harshanl
5b9c44655d
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
2015-12-03 20:20:26 +05:30
harshanl
30e8dc885c
Fixed EMM-1034
2015-12-03 20:13:10 +05:30
pasinduj
9c7ebdafdb
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
2015-12-03 18:30:45 +05:30
harshanl
b4d17b888b
fixed secondary user-store related issues & multi-tenancy issues
2015-11-20 00:43:01 +05:30
geethkokila
c1eea6894d
Fixing the feature remove from the policy
2015-11-19 14:45:08 +05:30
geethkokila
271c4f76cb
Fixnig the null pointer isssue
2015-11-16 18:08:21 +05:30
geethkokila
700b308b45
Fixing the null pointer and removnig innactive devices being monitored
2015-11-16 17:44:30 +05:30
geethkokila
1989abf881
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 17:41:37 +05:30
geethkokila
fed4f72d4b
Fixing the null pointer
2015-11-16 17:41:07 +05:30
harshanl
1252d4c160
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 17:21:33 +05:30
geethkokila
0f146e83fa
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
2015-11-16 17:17:15 +05:30
geethkokila
813f9072d8
Fixing the database issue which causes the deviceids slelect did not work
2015-11-16 17:15:16 +05:30
Dileesha Rajapakse
6446be100d
Refactored Policy Management DAO classes
2015-11-16 16:49:35 +05:30
Geeth
5fd9e87dc8
Merge pull request #44 from Kamidu/master
...
change the formatter
2015-11-10 20:35:58 +05:30
Kamidu Sachith
8953a61cc4
Enable Owneship type editing in policy
2015-11-10 20:17:59 +05:30
harshanl
026a7c187a
Fixed EMM-945, EMM-910, EMM-911, EMM-870
2015-11-10 18:17:34 +05:30
Kamidu Sachith
d7c942f395
Enable ownership editing on the policy
2015-11-10 14:51:10 +05:30
geethkokila
feab85796f
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
2015-11-02 19:44:52 +05:30
geethkokila
20122b3f1e
Fixing the roles and users adding issue
2015-10-30 17:48:30 +05:30
Kasun Delgolla
f519b7c029
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-29 15:46:41 +05:30
prabathabey
90240e7d3f
Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
2015-10-29 14:11:24 +05:30
Kasun Delgolla
8d52735e6a
Adding app list + info to monitoring operation
2015-10-20 09:51:43 +05:30
geethkokila
c46c4f1be9
Fixing the policy update issues
2015-10-19 20:34:02 +05:30
geethkokila
d15eb10636
Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
2015-10-17 17:08:12 +05:30
geethkokila
f49345e722
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-10-16 23:47:19 +05:30
geethkokila
8a8a152d36
Adding the policy task config
2015-10-16 23:47:16 +05:30
Dulitha Wijewantha
5962694ec2
Adding annotation for the description
2015-10-16 23:37:58 +05:30
Dulitha Wijewantha
002a1ec580
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-16 21:06:04 +05:30
Dulitha Wijewantha
1025e9a425
Fixes to user api
2015-10-16 21:05:51 +05:30
geethkokila
d52df2474e
Fixing policy descriptions
2015-10-15 13:01:53 +05:30
geethkokila
9fca18ae90
Fixing the monitoring issue
2015-10-14 18:54:39 +05:30
geethkokila
81034c84f5
Fixing the method name issue in policy manager service
2015-10-12 18:59:41 +05:30
Dulitha Wijewantha
45ce4dbe4e
Policy Updating
...
* Fixed issues regarding roles updating for policy
* Fixed the relevent test cases
JIRA:- https://wso2.org/jira/browse/EMM-812
2015-10-12 12:09:21 +05:30
harshanl
234cd47931
Added identity-extensions
2015-10-02 18:00:05 +05:30
mharindu
9813816fab
Fixed bug of adding operations
2015-09-29 16:24:35 +05:30
mharindu
9920f2919a
Fixed spelling mistakes of policy component
2015-09-09 20:00:10 +05:30
mharindu
fbd697edb0
Fixed issue in policy delegation executor
2015-09-08 11:27:29 +05:30
geethkokila
11ead87a5e
Fixing the policy listing issue
2015-09-03 20:49:26 +05:30
geethkokila
6ef4bdd73e
Fixing enrolment id issues
2015-09-02 22:55:52 +05:30
geethkokila
7dd48bf00e
Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
2015-09-02 19:39:50 +05:30
mharindu
1903b375f3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-09-02 15:34:11 +05:30
geethkokila
dff526b272
Removing the unnessary commets and imports
2015-09-02 15:02:33 +05:30
geethkokila
5ee8c0f065
Fixing the cache manager issues
2015-09-02 14:47:36 +05:30
mharindu
cd853c9ee8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-09-01 17:20:12 +05:30
mharindu
ad5335c9f5
Fixed local conflicts and merged
2015-09-01 15:29:24 +05:30
geethkokila
6c5f7d7ada
Fixing conflicts and checkcriterion method
2015-09-01 15:14:40 +05:30
prabathabey
2b6bf203e2
Resolving conflicts observed in policy management implementation
2015-09-01 15:06:41 +05:30
geethkokila
044995ed97
Adding the activate method when policies are added.
2015-09-01 15:03:09 +05:30
mharindu
fd29deb372
Fixed conflicts of local repo and merged
2015-09-01 12:57:13 +05:30
prabathabey
892b9681f5
Fixing transaction handling issues
2015-09-01 12:51:18 +05:30
geethkokila
458618191d
Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
2015-08-31 19:31:13 +05:30
geethkokila
c6d993e532
Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
2015-08-30 21:45:56 +05:30
geethkokila
bcb2c1ddb1
Commiting the monitoring changes and test case changes
2015-08-29 17:39:07 +05:30
geethkokila
44b496d350
Partially commiting due to update
2015-08-28 12:33:10 +05:30
mharindu
94326323bc
Added class level and method level comments for Policy core
2015-08-27 01:00:59 +05:30
mharindu
7fed00a14d
Removed unnecessary logs and added null checks in MonitoringManager
2015-08-26 18:10:10 +05:30
mharindu
5e285071d8
Removed unnecessary white spaces
2015-08-26 15:16:29 +05:30
mharindu
a51e7646e3
Fixing issues of previous PRs
2015-08-26 12:48:53 +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
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
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
b8462b02ac
Fixing the conflicts
2015-07-29 07:30:14 +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
f0ec3dbe4c
Fixed NPE issues in policy-mgt
2015-07-27 10:49:46 +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
milanperera
5a8975d7ac
Partial Commit
2015-07-23 16:55:54 +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
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
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
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
milanperera
7313ba1e7e
Implemented policy monitoring add operation
2015-07-21 19:43: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
geethkokila
e0301e4ce3
Adding the 90% completed monitoring task
2015-07-20 10:49:37 +05:30
manoj
b0a55a55c8
code clean up
2015-07-15 20:41:10 +05:30
manoj
6daa71771c
Unit tests for service layer
2015-07-14 17:12:45 +05:30
geethkokila
d048913e06
Adding the momitoring task partialy
2015-07-13 10:55:27 +05:30
geethkokila
388701c3a2
Adding partial commit to add a interface for plugins to implement to notify devices for monotoring
2015-07-07 11:54:24 +05:30
geethkokila
8bc7c5824a
Fixing test case failures and device dao errors
2015-07-06 17:57:59 +05:30
geethkokila
e0dd398b27
Fixing build failiures
2015-07-06 15:26:19 +05:30
geethkokila
3c73bba40c
Commiting ppartialy to get updates
2015-07-06 12:04:35 +05:30
geethkokila
524ce44036
Merge branch 'master' of https://github.com/wso1/carbon-device-mgt
2015-07-06 11:08:45 +05:30
geethkokila
2e89722883
Fixing the monitoring dao
2015-07-06 11:08:40 +05:30
prabathabey
974a616737
DAO refactoring
2015-07-04 14:24:35 +05:30
prabathabey
8d348a358c
Committing initial version of supporting device life cycle management
2015-07-04 12:12:47 +05:30
geethkokila
e4d156a77e
Adding policy monitoring to core, this is only having the monitoring daos and manager class and exceptions
2015-07-03 13:03:27 +05:30
prabathabey
2526d87c21
Introducing a separate bean to carry all enrolment data
2015-06-18 00:11:00 +05:30
prabathabey
60960d80b4
More code cleanups
2015-06-16 14:42:50 +05:30
geethkokila
549e4a784c
Fixing issues
2015-06-15 13:27:49 +05:30
prabathabey
c13975191e
Code cleanup
2015-06-13 00:44:21 +05:30
mharindu
29b58576f8
Fixed an issue in policy based on ownership type
2015-06-04 16:35:52 +05:30
mharindu
1ed6eec02f
Fixed bugs in policy
2015-06-03 14:43:48 +05:30
mharindu
6586eb028c
Merged
2015-06-03 11:34:46 +05:30
mharindu
16cc17369c
Refactored DCA
2015-06-02 18:58:43 +05:30
geethkokila
009c9dd6df
Fixing the user based policies
2015-06-01 12:05:12 -04:00
geethkokila
f7abe86e3c
Fixing the user based policies
2015-06-01 12:00:58 -04:00
manoj
707a8c9709
Add payload to policy operation
2015-05-30 02:22:03 +05:30
manoj
05a3244040
Add payload to policy operation
2015-05-30 02:16:50 +05:30
manoj
6188878340
Add operation code for policy operation
2015-05-30 00:51:58 +05:30
manoj
a4e6b02e60
Add operation type for policy operation
2015-05-30 00:42:46 +05:30
manoj
8a03c7a368
Add policy operation for effective policy
2015-05-30 00:29:57 +05:30
prabathabey
72e940b523
Code cleanup
2015-05-29 17:30:34 +05:30
geethkokila
535c4e4717
Fixing policy deletion
2015-05-26 04:05:20 -04:00
geethkokila
5cd63c1c88
Fixing policy count
2015-05-22 13:07:14 +05:30
geethkokila
5a4d2e20a4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-05-22 10:27:46 +05:30
geethkokila
30b01fc3bc
Fixing the sort issue
2015-05-22 10:27:34 +05:30
mharindu
ffaccbe371
Refactored policy
2015-05-22 03:03:46 +05:30
manoj
48a2062f64
Add operations for effective policy
2015-05-22 02:32:04 +05:30
geethkokila
6e18b7c11a
Adding the policy priority changing dao methods
2015-05-22 02:05:16 +05:30
mharindu
39ae880972
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-05-22 01:23:17 +05:30
mharindu
89d0fa0894
Implemented device count and policy count
2015-05-22 01:23:03 +05:30
geethkokila
29066134db
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-05-22 01:17:33 +05:30
manoj
302470ff8b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-05-22 01:19:48 +05:30
manoj
acdf6021a7
Policy related operations
2015-05-22 01:19:27 +05:30
manoj
85df7ca9a0
Policy related operations
2015-05-22 01:18:44 +05:30
geethkokila
3e37b73360
Removing unnessaccery code blocks
2015-05-22 01:17:20 +05:30
geethkokila
1f507e4224
Removing unneccessary catch exception
2015-05-22 01:13:38 +05:30
geethkokila
e8255e45c6
Adding the user list to policies
2015-05-22 01:04:44 +05:30
geethkokila
3382686d52
Fixing policies related issues, and adding the delete policy
2015-05-21 23:17:33 +05:30
geethkokila
a1f851243c
Fixing null pointer issue
2015-05-21 21:33:53 +05:30
geethkokila
e07d917ad6
Fixing bugs
2015-05-21 20:41:57 +05:30
geethkokila
a9d3d15438
Adding pofile operations
2015-05-21 17:46:57 +05:30
geethkokila
0638ec2357
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-05-21 17:27:31 +05:30
geethkokila
548ce6873f
Changing the get effective policy method to store the policy as a operation, and adding ownership type to the policy database
2015-05-21 17:27:17 +05:30
Dulitha Wijewantha
341abb47ab
Fixes to the timestamp and filters
2015-05-21 16:48:49 +05:30
geethkokila
4a4349382a
Adding the user core changes
2015-05-19 20:45:12 +05:30
geethkokila
1d180c1a1e
Adding the policy related new tables
2015-05-19 16:00:49 +05:30
geethkokila
10a585ea6a
Moing interfacs to common bundle and fixing test cases
2015-05-18 07:38:35 +05:30
geethkokila
38e09d49bb
Fixing bugs and fixing the criteria based policies
2015-05-17 23:18:10 +05:30
geethkokila
f83d919ed1
Merge branch 'master' of https://github.com/wso1/carbon-device-mgt
2015-05-15 20:25:11 +05:30
geethkokila
53c22fe9fe
Adding criteria based policy
2015-05-15 20:25:04 +05:30
Dulitha Wijewantha
acc159d132
* Refactored addPolicy
2015-05-13 22:04:15 +05:30
Dulitha Wijewantha
5a3dcda993
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-05-12 18:19:15 +05:30
Dulitha Wijewantha
dcf0f5039d
* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length* Increased field length
2015-05-12 18:18:46 +05:30
geethkokila
2abfff5c36
Removing policy saving after the evaluation.
2015-05-12 18:12:50 +05:30
Dulitha Wijewantha
c277a5988a
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-05-12 16:30:19 +05:30
Dulitha Wijewantha
89a12a5660
* Added xml annotations to Policy and Profile
...
* Added methods to Policy Administrator Point
2015-05-12 16:26:20 +05:30
geethkokila
73b185e1e6
Removing feature implementation from the policy, adding criteria based policy
2015-05-12 16:20:18 +05:30
geethkokila
2ef37b8aa8
Fixing issues related to apis to call and get effective policy
2015-05-07 16:31:39 +05:30
Geeth Munasinghe
a872caeefc
Code revie fixes
2015-05-05 08:25:15 +05:30
Geeth Munasinghe
7607aa5268
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-04-30 15:00:39 +05:30
Geeth Munasinghe
93ba0414bc
Fine tuning the code and removing PIP as osgi service
2015-04-30 15:00:33 +05:30
manoj
6f59913621
Refractor Operations
2015-04-28 14:45:49 +05:30
manoj
5a4e4ec4a0
Operations Refractor
2015-04-28 14:42:59 +05:30
Geeth Munasinghe
cf4a2f8fc4
Adding the final policy management classes, this includes the manager classes which manages the jta transactions from DAO, Test cases are added too
2015-04-24 18:46:46 +05:30
Geeth Munasinghe
90ff502b21
Adding the final changes of the policy implementation, Added the simple policy evaluation implementation
2015-04-10 20:10:50 +05:30
Geeth Munasinghe
e53f2d2063
Adding profile feature bean and almost completing the dao classes, adding the PIP implementation, fixing the test cases, adding the policy manager relavant methods for PIP and PAP.
2015-04-09 17:57:04 +05:30
prabathabey
14e7be6146
Extending operation management functionality to support Profile operations
2015-03-28 20:00:49 +05:30
prabathabey
3070488adf
Fixing Pom issues
2015-03-24 18:28:56 +05:30
Geeth Munasinghe
5bdbcaa077
Seperating the dao to Feature, profile, policy and adding the exeception for each ones
2015-03-18 14:00:21 +05:30
Geeth Munasinghe
d7abfbc19b
Adding the missed classes
2015-03-18 12:10:52 +05:30
Geeth Munasinghe
5a253b286e
Adding the policy management service and dao implementation, basic architecture is implemented here, only thing we have to do is to fill the method with relavant informations. PDP, PEP, PIP services are renamed.
2015-03-18 12:08:25 +05:30
Geeth Munasinghe
c13b942f0e
Adding the DAO layers for the policy administration, Test cases are added for H2 database type and MySql, This is having the initial cut of the policy and profile saving
2015-03-12 19:41:39 +05:30
Geeth Munasinghe
ac2fa547d4
[maven-release-plugin] prepare for next development iteration
2015-02-24 14:29:34 +05:30
Geeth Munasinghe
28a1bd9fde
[maven-release-plugin] prepare release v0.9.1
2015-02-24 14:29:25 +05:30
Geeth Munasinghe
1a550269f1
Changing the version to 0.9.1-SNAPSHOT
2015-02-24 14:24:16 +05:30
Geeth Munasinghe
835207a13d
[maven-release-plugin] prepare for next development iteration
2015-02-23 18:54:54 +05:30
Geeth Munasinghe
7933271193
[maven-release-plugin] prepare release v0.9.1
2015-02-23 18:54:44 +05:30
Geeth Munasinghe
60e98f12b2
Adding the bundle activator for PIP
2015-02-13 19:46:08 +05:30
harshanL
db5b8b1e1e
Fixed build issue
2015-02-13 10:19:02 +05:30
