21bc812281
Minor refactoring on Policy Eval service comp
8 years ago
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
8 years ago
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
8 years ago
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
2b7d5fd66b
Fixing the null pointer issue in policy manager
8 years ago
a59edee410
[maven-release-plugin] prepare for next development iteration
8 years ago
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
8 years ago
d911281ad1
Merging master branch with release-2.0.x
8 years ago
228b24ca79
[maven-release-plugin] prepare for next development iteration
8 years ago
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
8 years ago
20ca76640d
Adding changes for the grouping and ownership changes
8 years ago
0879a75f7b
Fixing the serializing issue of device groups.
8 years ago
8431b30ddc
[maven-release-plugin] prepare for next development iteration
8 years ago
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
8 years ago
19c1b3566d
[maven-release-plugin] prepare for next development iteration
8 years ago
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
8 years ago
a6064d2561
Update component versions for IoTS-1.0.0 release
8 years ago
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
8 years ago
9517a3d30f
[maven-release-plugin] prepare for next development iteration
8 years ago
a8568299b9
[maven-release-plugin] prepare release v1.2.6
8 years ago
1bfba25c5e
Remove user list and role list attributes from group object
...
Move group components to same devicemgt package levels
8 years ago
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
8 years ago
27a2c9b979
[maven-release-plugin] prepare for next development iteration
8 years ago
eae935f91c
[maven-release-plugin] prepare release v1.2.5
8 years ago
370f6de260
Removed applied policy upon removal of the last policy applicable for a device
8 years ago
6a55e1be83
[maven-release-plugin] prepare for next development iteration
8 years ago
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
8 years ago
036ed6fe41
Added POLICY_REVOKE operation upon deletion of the last policy
8 years ago
73539362d4
Refactored PolicyAdministratorPointImpl
8 years ago
6e1fdabaad
EMM-1342:Added policy revoke operation
8 years ago
24c38602b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
51910ee67a
EMM-1675:Added policy revoke operation
8 years ago
ca68181541
Fixing NPE of EMM-1715
8 years ago
2128f08658
fixing EMM-1750
8 years ago
2f852d84f4
Fix for the issue : EMM policy updating issue
8 years ago
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
8 years ago
4bcf350236
EMM-1678:Updated the oauth component versions
8 years ago
f22d392978
Upgrade to comply with latest CDMF changes
8 years ago
f9ba45f439
Fixed the device status changing issue when there are multiple enrollments for the same device
8 years ago
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
8 years ago
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
8 years ago
f24242fb8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dd03d0b740
Added device status change upon inactivity mechanism
8 years ago
0c92f80e68
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
...
Migrating kernel/apim/appm/identity to latest versions
8 years ago
1b6c7ea502
Refactored PolcyMgt component
8 years ago
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
8 years ago
108ea98677
Refactor policy mgt components and fixed add operations for invalid devices from task service
8 years ago
c967fc34d0
Fixed EMM-1513
8 years ago
50d8885f8b
[maven-release-plugin] prepare for next development iteration
8 years ago
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
8 years ago
6a8a5cbd5a
Merging with master
8 years ago
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
de23a8cf27
[maven-release-plugin] prepare for next development iteration
8 years ago
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
8 years ago
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
671ef77b63
Fixed EMM-1107 issue
8 years ago
2d5262e21e
[maven-release-plugin] prepare for next development iteration
8 years ago
5ccd752404
[maven-release-plugin] prepare release v1.2.0
8 years ago
654e1d9938
[maven-release-plugin] prepare for next development iteration
8 years ago
aa24821667
[maven-release-plugin] prepare release v1.1.2
8 years ago
6db619317c
fixing app-install issue
8 years ago
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
8 years ago
07b12fe4ea
Bug fixes
8 years ago
ca8859c80a
Fixing broken build due to new javax.xml imports
8 years ago
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.
8 years ago
0ac4752b2b
Fixed null pointer dereference
9 years ago
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
9 years ago
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
9 years ago
ffedcac543
[maven-release-plugin] prepare release v1.1.1
9 years ago
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
9 years ago
2befefc967
Added OS build date
9 years ago
be7e63c390
merging rest-api-improvements branch to master
9 years ago
24b462f4f4
Added is-active field to the Application
9 years ago
624e7df688
Improving HTTP status code handling and the resource implementations
9 years ago
1fabb0eee3
Fixing the database syncing issue
9 years ago
b24250f3f2
Returning device info within the device bean itself
9 years ago
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
9 years ago
726a700528
Improving error handling in checking for monitoring frquency
9 years ago
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
9 years ago
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
9 years ago
1341884957
resolving conflicts
9 years ago
60b42715d6
syncing admin api from product emm
9 years ago
3e291c5b13
[maven-release-plugin] prepare for next development iteration
9 years ago
9549ac446b
[maven-release-plugin] prepare release v1.1.0
9 years ago
a375252a94
Adding pluggable push notification framework
9 years ago
94aacb1625
Adding swagger annotations to beans
9 years ago
5d1bf67630
Adding swagger annotations to beans
9 years ago
087adafeb7
Adding swagger annotations to beans
9 years ago
3396a5066d
Adding changes for the updated time of device info and device location
9 years ago
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
2fb42518b6
Adding the changes for the device group with policy.
9 years ago
9068a3d893
Fixing compilation failures caused due to API changes
9 years ago
4cf37bb16c
Fixing the compilation error on the proprietory plugins.
9 years ago
ce8d4b53a2
Adding temporary development code bits of dashboard analytics feature
9 years ago
c45895685b
Added device type multi tenancy capability.
9 years ago
e9da24c9e8
Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
41191d6df0
Adding the search feature to device mgt plugin
9 years ago
e0e0a57c11
[maven-release-plugin] prepare for next development iteration
9 years ago
cebb88e712
[maven-release-plugin] prepare release v1.0.3
9 years ago
e66d291947
[maven-release-plugin] prepare for next development iteration
9 years ago
f416a73e75
[maven-release-plugin] prepare release v1.0.2
9 years ago
d0a2c5521c
Commenting this due to policy compliance warn will block the device
9 years ago
185a59fbd4
[maven-release-plugin] prepare for next development iteration
9 years ago
b3580d754b
[maven-release-plugin] prepare release v1.0.1
9 years ago
402b843e5d
Updated task schedule service to fix EMM-1145, EMM-1100
9 years ago
7a27e88551
Changing the log levels configured in log4j.properties files used as part of test configurations
9 years ago
4e9255fbc9
[maven-release-plugin] prepare for next development iteration
9 years ago
ceb60adb34
[maven-release-plugin] prepare release v1.0.0
9 years ago
ddefa19e0f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
d5f87f4dc1
Committing policy compliance monitoring issue
9 years ago
9a50455a29
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
00cf61c44c
Fixed EMM-1069 and refactore DCR services
9 years ago
f49f13501f
modified dbscripts removing policy ID forigen key from one table
9 years ago
a390df68ec
modified dbscripts to remove foriegn key reference
9 years ago
5b9c44655d
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
9 years ago
30e8dc885c
Fixed EMM-1034
9 years ago
9c7ebdafdb
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
9 years ago
b4d17b888b
fixed secondary user-store related issues & multi-tenancy issues
9 years ago
c1eea6894d
Fixing the feature remove from the policy
9 years ago
271c4f76cb
Fixnig the null pointer isssue
9 years ago
700b308b45
Fixing the null pointer and removnig innactive devices being monitored
9 years ago
1989abf881
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
fed4f72d4b
Fixing the null pointer
9 years ago
1252d4c160
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
0f146e83fa
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
9 years ago
813f9072d8
Fixing the database issue which causes the deviceids slelect did not work
9 years ago
6446be100d
Refactored Policy Management DAO classes
9 years ago
5fd9e87dc8
Merge pull request #44 from Kamidu/master
...
change the formatter
9 years ago
8953a61cc4
Enable Owneship type editing in policy
9 years ago
026a7c187a
Fixed EMM-945, EMM-910, EMM-911, EMM-870
9 years ago
d7c942f395
Enable ownership editing on the policy
9 years ago
feab85796f
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
9 years ago
20122b3f1e
Fixing the roles and users adding issue
9 years ago
f519b7c029
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
90240e7d3f
Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
8d52735e6a
Adding app list + info to monitoring operation
9 years ago
c46c4f1be9
Fixing the policy update issues
9 years ago
d15eb10636
Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
9 years ago
f49345e722
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
8a8a152d36
Adding the policy task config
9 years ago
5962694ec2
Adding annotation for the description
9 years ago
002a1ec580
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
1025e9a425
Fixes to user api
9 years ago
d52df2474e
Fixing policy descriptions
9 years ago
9fca18ae90
Fixing the monitoring issue
9 years ago
81034c84f5
Fixing the method name issue in policy manager service
9 years ago
45ce4dbe4e
Policy Updating
...
* Fixed issues regarding roles updating for policy
* Fixed the relevent test cases
JIRA:- https://wso2.org/jira/browse/EMM-812
9 years ago
234cd47931
Added identity-extensions
9 years ago
9813816fab
Fixed bug of adding operations
9 years ago
9920f2919a
Fixed spelling mistakes of policy component
9 years ago
fbd697edb0
Fixed issue in policy delegation executor
9 years ago
11ead87a5e
Fixing the policy listing issue
9 years ago
6ef4bdd73e
Fixing enrolment id issues
9 years ago
7dd48bf00e
Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
9 years ago
1903b375f3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dff526b272
Removing the unnessary commets and imports
9 years ago
5ee8c0f065
Fixing the cache manager issues
9 years ago
cd853c9ee8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
ad5335c9f5
Fixed local conflicts and merged
9 years ago
6c5f7d7ada
Fixing conflicts and checkcriterion method
9 years ago
2b6bf203e2
Resolving conflicts observed in policy management implementation
9 years ago
044995ed97
Adding the activate method when policies are added.
9 years ago
fd29deb372
Fixed conflicts of local repo and merged
9 years ago
892b9681f5
Fixing transaction handling issues
9 years ago
458618191d
Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
9 years ago
c6d993e532
Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
9 years ago
bcb2c1ddb1
Commiting the monitoring changes and test case changes
9 years ago
44b496d350
Partially commiting due to update
9 years ago
94326323bc
Added class level and method level comments for Policy core
9 years ago
7fed00a14d
Removed unnecessary logs and added null checks in MonitoringManager
9 years ago
5e285071d8
Removed unnecessary white spaces
9 years ago
a51e7646e3
Fixing issues of previous PRs
9 years ago
6cff144573
Merge pull request #26 from milanperera/master
...
Added null check to MonitoringManagerImpl
9 years ago
fa82a28c0f
Added null check to MonitoringManagerImpl
9 years ago
2311572d49
code cleanup
9 years ago
cd31662a96
Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
05c3d080e0
Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
cdbdc86f42
Fixing transactional anomalies and code cleanup
9 years ago
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
9 years ago
5b46a4e2f8
Commenting out unreachable state for now
9 years ago
cceb3ac5db
Fixing errors and adding caching sketch
9 years ago
4e5a38998d
Updating DAO Layer
9 years ago
90f8f4aab6
Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
9 years ago
b8462b02ac
Fixing the conflicts
9 years ago
54cd6b80f4
Fixing merge conflicts
9 years ago
955c119006
Adding policy delegation
9 years ago
dc205aa081
Fixing the conflicts
9 years ago
6d687364c6
Fixing the monitoring tasks
9 years ago
f0ec3dbe4c
Fixed NPE issues in policy-mgt
9 years ago
5b2e0c8989
Merged
9 years ago
fde54d2d32
Fixing the monitoring service
9 years ago
5a8975d7ac
Partial Commit
9 years ago
2769392bc0
Fixing the monitoring task for not to notify the blocked and inactive devices
9 years ago
bd75f70a24
Fixing the merge conflicts
9 years ago
6270dff93c
Fixing priviledege carbon context issue in device-mgt component
9 years ago
8ab843e76c
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
...
Merging the milan's changes
9 years ago
35ac8ec6c9
Fixed formating issues in PolicyManagerImpl
9 years ago
de6572d819
Fixed for JIRA MDM-372
9 years ago
aee2402d0d
Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
9 years ago
7313ba1e7e
Implemented policy monitoring add operation
9 years ago
00b9303283
Fixed the issue with java package name
10 years ago
c4739efd0e
Fixing the policy monitoring service adding
10 years ago
9ca5815ec3
Fixing the saving issues
10 years ago
e0301e4ce3
Adding the 90% completed monitoring task
10 years ago
b0a55a55c8
code clean up
10 years ago
6daa71771c
Unit tests for service layer
10 years ago
d048913e06
Adding the momitoring task partialy
10 years ago
388701c3a2
Adding partial commit to add a interface for plugins to implement to notify devices for monotoring
10 years ago
8bc7c5824a
Fixing test case failures and device dao errors
10 years ago
e0dd398b27
Fixing build failiures
10 years ago
3c73bba40c
Commiting ppartialy to get updates
10 years ago
524ce44036
Merge branch 'master' of https://github.com/wso1/carbon-device-mgt
10 years ago
2e89722883
Fixing the monitoring dao
10 years ago
974a616737
DAO refactoring
10 years ago
8d348a358c
Committing initial version of supporting device life cycle management
10 years ago
e4d156a77e
Adding policy monitoring to core, this is only having the monitoring daos and manager class and exceptions
10 years ago
2526d87c21
Introducing a separate bean to carry all enrolment data
10 years ago
60960d80b4
More code cleanups
10 years ago
549e4a784c
Fixing issues
10 years ago
c13975191e
Code cleanup
10 years ago
29b58576f8
Fixed an issue in policy based on ownership type
10 years ago
1ed6eec02f
Fixed bugs in policy
10 years ago
6586eb028c
Merged
10 years ago
16cc17369c
Refactored DCA
10 years ago
009c9dd6df
Fixing the user based policies
10 years ago
f7abe86e3c
Fixing the user based policies
10 years ago
707a8c9709
Add payload to policy operation
10 years ago
05a3244040
Add payload to policy operation
10 years ago
6188878340
Add operation code for policy operation
10 years ago
a4e6b02e60
Add operation type for policy operation
10 years ago
8a03c7a368
Add policy operation for effective policy
10 years ago
72e940b523
Code cleanup
10 years ago
535c4e4717
Fixing policy deletion
10 years ago
5cd63c1c88
Fixing policy count
10 years ago
5a4d2e20a4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
30b01fc3bc
Fixing the sort issue
10 years ago
ffaccbe371
Refactored policy
10 years ago
48a2062f64
Add operations for effective policy
10 years ago
6e18b7c11a
Adding the policy priority changing dao methods
10 years ago
39ae880972
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
89d0fa0894
Implemented device count and policy count
10 years ago
29066134db
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
302470ff8b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
acdf6021a7
Policy related operations
10 years ago
85df7ca9a0
Policy related operations
10 years ago
3e37b73360
Removing unnessaccery code blocks
10 years ago
1f507e4224
Removing unneccessary catch exception
10 years ago
e8255e45c6
Adding the user list to policies
10 years ago
3382686d52
Fixing policies related issues, and adding the delete policy
10 years ago
Supun94
Rasika Perera
WSO2 Builder
geethkokila
charitha
harshanl
susinda
hasuniea
kamidu
Chatura Dilan Perera
Ruwan
thusithakalugamage
Prabath Abeysekara
Timo Briddigkeit
prabathabey
inosh
mharindu
Madhawa Perera
dilanua
ayyoob
pasinduj
Kasun Delgolla
Dileesha Rajapakse
Dulitha Wijewantha
Dilshan Edirisuriya
Dilshan Edirisuriya
manoj