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
2,111 Commits 31 Branches 461 Tags 183 MiB
00a16ea2bc
Commit Graph

1620 Commits

Author SHA1 Message Date
prabathabey
7e65b837d1 Committing logic that stores BST within request metadata 2015-12-21 22:48:47 +05:30
harshanl
bb9e07b742 Fixed BSTValidator 2015-12-21 21:41:34 +05:30
prabathabey
ed8242fc66 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 20:22:14 +05:30
prabathabey
a7b447b7db Adding BST authenticator 2015-12-21 20:21:51 +05:30
Kamidu Sachith
6b2c3289dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 17:39:08 +05:30
Kamidu Sachith
c6e2c01caa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 16:45:52 +05:30
Kamidu Sachith
2d23eb86eb Improve runtime performance 2015-12-21 16:38:42 +05:30
pasinduj
8628e5e523 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 15:03:46 +05:30
pasinduj
c7b53f7110 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 14:44:23 +05:30
harshanl
a61fe6171a Refactored pagination code 2015-12-21 14:22:09 +05:30
prabathabey
67e1bfb012 Making attribute names schema compliant and code cleanup 2015-12-21 12:23:59 +05:30
prabathabey
0cdc139a0b Adding updated webapp authenticator config 2015-12-21 11:57:50 +05:30
prabathabey
edf21ae5c8 Improving performance of token validation service invocation 2015-12-21 11:33:22 +05:30
prabathabey
11957f1e47 Pooling OAuth token validator stub initialization 2015-12-21 11:00:42 +05:30
pasinduj
08387e178d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 09:37:21 +05:30
prabathabey
b5b4e50b25 Revert "Improving performance of webapp authenticator valve implementation" 
This reverts commit 36462e2e4e.
 2015-12-19 13:28:24 +05:30
prabathabey
337afa5da2 Revert "Further optimizing webapp authenticator valve implementation" 
This reverts commit 262e53ddcc.
 2015-12-19 13:27:45 +05:30
prabathabey
262e53ddcc Further optimizing webapp authenticator valve implementation 2015-12-19 13:09:31 +05:30
prabathabey
28a2e918e7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-19 12:07:19 +05:30
prabathabey
36462e2e4e Improving performance of webapp authenticator valve implementation 2015-12-19 12:07:08 +05:30
Dileesha Rajapakse
b25438097e Fixed issues in EnrollmentDAOImpl 2015-12-18 23:26:01 +05:30
Harshan Liyanage
c600b2a3c9 Merge pull request #99 from Kamidu/master 
Removing unwanted debug comments
 2015-12-18 22:40:13 +05:30
harshanl
6441c201e5 Added search support for pagination 2015-12-18 22:17:07 +05:30
Kamidu Sachith
230dbd1331 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 20:38:30 +05:30
Kamidu Sachith
057a55a3ab Removing unwanted debug comments 2015-12-18 20:38:14 +05:30
Kasun Delgolla
773d78df3f Merge pull request #98 from Kamidu/master 
Code clean up and formatting
 2015-12-18 18:12:07 +05:30
prabathabey
8585abff8d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 18:00:55 +05:30
prabathabey
05020c960d Upgrading Carbon kernel and identity versions 2015-12-18 17:59:42 +05:30
Kamidu Sachith
30768bba71 Code clean up and formatting 2015-12-18 17:54:50 +05:30
Kamidu Sachith
3fbc3ea40f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 15:26:45 +05:30
Kamidu Sachith
7b544f3545 Fix the disable failier of the authenticator 2015-12-18 15:26:26 +05:30
Dileesha Rajapakse
eb680da572 Fixed EMM-1103 2015-12-17 14:57:28 +05:30
harshanl
91ece82eca Updated operation DAO to sort data in DESC order of timestamp. 2015-12-17 12:52:42 +05:30
pasinduj
3899e8779f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 11:50:21 +05:30
harshanl
d4b6ba5e36 Added pagination support for operation management apis. 2015-12-17 10:32:06 +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
7be1de1b85 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-11 11:30:41 +05:30
harshanl
08ebd7f881 Added DCR proxy endpoint & refactored code. 2015-12-11 11:10:53 +05:30
geethkokila
93a295f8a7 Fixing the dynamic imports 2015-12-10 18:25:45 +05:30
harshanl
20a03c42fc Merged with master 2015-12-10 16:52:35 +05:30
harshanl
89e6f0786d Refactored dynamic-client module to use remote services. 2015-12-10 16:50:33 +05:30
pasinduj
a9a502ac74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 09:15:17 +05:30
geethkokila
49ae3298f4 Fixing the build failure due to neethi bundle being plugged in to web app lib folder 2015-12-09 20:06:28 +05:30
geethkokila
ba7acabb04 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-09 20:03:07 +05:30
geethkokila
865f5a500e Fixing the build failure due to neethi bundle being plugged in to web app lib folder 2015-12-09 20:02:58 +05:30
Kamidu Sachith
6f57200864 Hanlde dependancy in dynamic client registration by removing recursive dependancy 2015-12-09 14:40:33 +05:30
pasinduj
f49f13501f modified dbscripts removing policy ID forigen key from one table 2015-12-08 15:35:01 +05:30
pasinduj
81911bace0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-08 13:26:35 +05:30
pasinduj
a390df68ec modified dbscripts to remove foriegn key reference 2015-12-08 11:42:04 +05:30
harshanl
92af749276 Fixed build break 2015-12-07 20:53:07 +05:30
harshanl
740124136b Refactored backend oauth authenticator component and added logic to validate OAuth token from local & remote servers. 2015-12-07 20:25:47 +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
inosh-perera
b5a6280c8d refactoring comments 2015-12-03 11:28:12 +05:30
inosh-perera
d4403c6d87 adding new table to h2 script 2015-12-03 10:16:10 +05:30
inosh-perera
ff6e316406 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-02 07:55:58 +05:30
inosh-perera
3b1a3073f5 certificate persistance and ritrival from the database 2015-12-02 07:55:35 +05:30
harshanl
73906f7cda Fixed EMM-1003 2015-11-30 22:20:33 +05:30
harshanl
d95a198ad6 Fixed EMM-1001 2015-11-30 19:56:47 +05:30
Kamidu Sachith
53064516d3 Fix for the Jira Issue EMM-989 2015-11-26 16:02:16 +05:30
Kamidu Sachith
8573a284e0 Enable Domain name in the invitation main 2015-11-26 11:39:11 +05:30
manoj
e1dc3d2ea3 add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation 2015-11-20 22:14:18 +05:30
manoj
99f82e4817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-20 12:52:32 +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
manoj
a04658af14 App Manager integration 2015-11-19 10:21:59 +05:30
manoj
79c268cb41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-19 10:18:01 +05:30
Dileesha Rajapakse
767ea70436 Refactored CommandOperation DAO class 2015-11-18 22:05:15 +05:30
Dileesha Rajapakse
8bd9295f81 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 19:28:40 +05:30
Dileesha Rajapakse
f3cfb79bac Refactored Operation DAO classes 2015-11-17 19:28:32 +05:30
harshanl
f0471203e7 Added logic to skip device authorization for policy operations 2015-11-17 18:28:42 +05:30
Dileesha Rajapakse
6e95451f57 Refactored Operation DAO class 2015-11-17 17:26:55 +05:30
manoj
dbf8d13ced Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 16:15:24 +05:30
manoj
20db31c2a9 Add app manager features 2015-11-17 16:14:51 +05:30
Dileesha Rajapakse
825017a492 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 09:58:43 +05:30
Dileesha Rajapakse
4379232c25 Refactored Enrollment DAO class 2015-11-16 22:01:21 +05:30
harshanl
2fa99ac475 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 19:57:59 +05:30
harshanl
a3e20367f2 Fixed issue in Policy Task when DeviceAuthorization enabled. 2015-11-16 19:51:59 +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
f8a2117911 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 16:52:43 +05:30
Dileesha Rajapakse
6446be100d Refactored Policy Management DAO classes 2015-11-16 16:49:35 +05:30
Dileesha Rajapakse
91d9db1ffa Refactored ApplicationMapping and ProfileOperation DAO classes 2015-11-16 14:15:54 +05:30
Dilshan Edirisuriya
7023537fcd Setting owner in authentication info 2015-11-16 13:49:02 +05:30
Dileesha Rajapakse
27254cc922 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 11:45:29 +05:30
harshanl
cb02c9da80 Fixed issues in DeviceAuthorization 2015-11-16 11:43:52 +05:30
Dileesha Rajapakse
6f0276ab2f Modified Application Mapping DAO classes 2015-11-16 11:39:52 +05:30
Dileesha Rajapakse
7b2cfd69f5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 09:49:37 +05:30
harshanl
b9ca6705ae Merged changes 2015-11-13 21:57:05 +05:30
harshanl
e14f09b8a8 Added requireDeviceAuthorization support 2015-11-13 21:33:33 +05:30
manoj
fdc4ad8e18 Set user level autherization is support by plugin or not 2015-11-13 21:29:47 +05:30
manoj
22c2da7fcb Set user level autherization is support by plugin or not 2015-11-13 21:22:38 +05:30
manoj
dc2e41e083 Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction 2015-11-13 19:02:55 +05:30
manoj
adc3b652bf Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction 2015-11-13 18:57:45 +05:30
Dileesha Rajapakse
786eb93bca Refactored Operation DAO classes 2015-11-13 14:15:05 +05:30
Dileesha Rajapakse
123ea228ad Refactored Enrolment DAO class 2015-11-12 10:30:45 +05:30
Dileesha Rajapakse
72ffe4e4a4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-12 09:04:56 +05:30
harshanl
5af6f314d0 Fixed EMM-939 2015-11-11 20:58:47 +05:30
Dileesha Rajapakse
1975821446 Refactored Device and Application DAO classes 2015-11-11 18:47:02 +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
5d107b0d56 Merged changes 2015-11-10 18:46:26 +05:30
harshanl
93e641893c Merged changes 2015-11-10 18:31:02 +05:30
harshanl
026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870 2015-11-10 18:17:34 +05:30
inosh-perera
4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI 2015-11-10 17:36:30 +05:30
Kamidu Sachith
d7c942f395 Enable ownership editing on the policy 2015-11-10 14:51:10 +05:30
Kamidu Sachith
4590de6a76 chenge the formatter 2015-11-04 15:12:23 +05:30
harshanl
c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 18:59:26 +05:30
harshanl
74a3b0e346 Fixed EMM-910 2015-11-03 18:58:52 +05:30
geethkokila
30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url 2015-11-03 16:24:49 +05:30
harshanl
2b9239d208 Optimized the authenticator framework 2015-11-03 14:29:38 +05:30
harshanl
fa92aecf58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 11:34:32 +05:30
harshanl
520c07693d Added support for non-secured endpoints within a security enabled webapp 2015-11-02 20:45:43 +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
2479be9f5a Fixing the email client issue 2015-11-02 19:37:21 +05:30
harshanl
6ebfbc4136 Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master 2015-10-30 18:34:16 +05:30
harshanl
c9ffedbac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-30 18:29:53 +05:30
harshanl
8f982722fb Added oauth response messages 2015-10-30 18:29:32 +05:30
geethkokila
20122b3f1e Fixing the roles and users adding issue 2015-10-30 17:48:30 +05:30
Kasun Delgolla
c00b1ee713 Committing fix for JIRA- EMM-860 2015-10-29 20:46:48 +05:30
Kasun Delgolla
6f2d1ad065 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 20:45:29 +05:30
harshanl
7cdd262b91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-29 17:53:18 +05:30
harshanl
7c0996270f Fixed EMM-887 2015-10-29 17:53:09 +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
9fa7c16e54 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 10:41:34 +05:30
hasuniea
3de4718ab5 refactored certificate generator 2015-10-29 10:04:13 +05:30
harshanl
8a1dba166a Updated FeatureMgr spec 2015-10-28 22:09:01 +05:30
Dilshan Edirisuriya
5c2b7c9624 Removing commons codec version 2015-10-28 20:06:10 +05:30
Dilshan Edirisuriya
bbc1132100 Commenting previous lines 2015-10-28 19:24:05 +05:30
Kasun Delgolla
efa90b244f Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-28 19:05:31 +05:30
Dilshan Edirisuriya
0b800b8615 Bug fixes 2015-10-28 18:49:47 +05:30
Kasun Delgolla
acdfc475be Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-28 10:17:23 +05:30
hasuniea
8f595818dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-23 14:51:10 +05:30
hasuniea
e1a24abfa3 refactored certificate service 2015-10-23 14:46:56 +05:30
geethkokila
168a011376 Fixing the issue of identity snapshot change 2015-10-22 16:27:40 +05:30
Kasun Delgolla
f830a14a8b Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-22 11:09:44 +05:30
harshanl
b3e0f804b0 Added comments. 2015-10-21 17:19:49 +05:30
harshanl
52fab37c61 Fixed issue in permission validator 2015-10-21 15:43:26 +05:30
harshanl
e1c9f1c602 Added url param support to permission tree. 2015-10-21 12:55:44 +05:30
Kasun Delgolla
3385bfacd2 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-21 11:17:10 +05:30
hasuniea
efd029083b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-21 10:55:01 +05:30
hasuniea
2c2216e48d implement certificateManagement service 2015-10-21 10:38:09 +05:30
harshanl
340a690995 Added sql script 2015-10-20 10:11:42 +05:30
Kasun Delgolla
8d52735e6a Adding app list + info to monitoring operation 2015-10-20 09:51:43 +05:30
hasuniea
3a6e9f09fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-20 09:15:36 +05:30
harshanl
1d4bba9807 License issue fixed 2015-10-20 08:12:02 +05:30
harshanl
09fbf9e8a1 Fixed DAO issues 2015-10-19 22:45:39 +05:30
harshanl
04eba0f313 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-19 22:45:12 +05:30
hasuniea
53f4dc7ae5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-19 20:49:43 +05:30
hasuniea
7a110a8eb5 implemented certificateGenerater 2015-10-19 20:49:26 +05:30
geethkokila
c46c4f1be9 Fixing the policy update issues 2015-10-19 20:34:02 +05:30
harshanl
89e930d530 Fixed isssues in pagination 2015-10-18 21:56:13 +05:30
harshanl
25d7459974 Pagination changes 2015-10-18 20:50:39 +05:30
harshanl
ca3653737c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 20:22:47 +05:30
harshanl
155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:54:35 +05:30
geethkokila
703eebb715 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:39:55 +05:30
prabathabey
a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:18:26 +05:30
prabathabey
c74e27102f Fixing issues in adding license configs 2015-10-18 18:16:52 +05:30
inosh-perera
cab888d321 fixing issues in oauth app creation, SAML. Moving service provider configuratiions to config files 2015-10-18 17:26:32 +05:30
harshanl
81b6770c08 Fixed oauth issue with tenants 2015-10-18 01:44:28 +05:30
geethkokila
182e15d632 Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master 2015-10-17 20:18:25 +05:30
Kamidu Sachith
ddbd2c5372 Java 8 support 2015-10-17 20:03:19 +05:30
harshanl
9b40f73597 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-17 17:11:32 +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
harshanl
0646b424ed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-16 23:40:25 +05:30
harshanl
6c196d5317 Added pagination support 2015-10-16 23:40:13 +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
Kamidu Sachith
d5dcf44f27 Change the service registration 2015-10-16 18:39:34 +05:30
harshanl
2a6db0cdc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-15 16:32:09 +05:30
geethkokila
d52df2474e Fixing policy descriptions 2015-10-15 13:01:53 +05:30
harshanl
9a68aa92bc Removed the use of web-app context in permission.xml of webapps 2015-10-14 22:33:36 +05:30
geethkokila
9fca18ae90 Fixing the monitoring issue 2015-10-14 18:54:39 +05:30
harshanl
b0d6038b69 Refactored dynamic client code & add tenancy handling to authenticators 2015-10-13 22:30:12 +05:30
Kamidu Sachith
5c215189d1 Enable java8 support 2015-10-13 11:45:00 +05:30
harshanl
d9bcb617eb Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master 2015-10-12 19:49:40 +05:30
harshanl
d4eab9f86e Code refactored. 2015-10-12 19:48:35 +05:30
geethkokila
81034c84f5 Fixing the method name issue in policy manager service 2015-10-12 18:59:41 +05:30
Kamidu Sachith
a66949c7e0 Code Fixing 2015-10-12 18:45:32 +05:30
Kamidu Sachith
824f57b5d2 Change the code for better performance 2015-10-12 18:36:59 +05:30
Kamidu Sachith
fe355b3184 Romoving Temporary Solutions 2015-10-12 18:13:46 +05:30
Kamidu Sachith
743f394fb9 Requested Modifications 2015-10-12 18:11:44 +05:30
Kamidu Sachith
d932522d37 refactoring class 2015-10-12 18:03:13 +05:30
Kamidu Sachith
8cc38c87f5 requested modification 2015-10-12 17:57:43 +05:30
Kamidu Sachith
831fed6d38 Resolving imports 2015-10-12 17:42:10 +05:30
Dulitha Wijewantha
5e07e52be8 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-12 12:20:46 +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
741777682a Fixed dynamic client registration issues with server startup 2015-10-09 19:20:12 +05:30
Kamidu Sachith
786728b49b Recomended Changes to Enabling OAuth Authentication for BackEnd Services 2015-10-08 17:54:49 +05:30
Kamidu Sachith
97df36842d Enabling OAuth Authentication for BackEnd Services 2015-10-08 14:02:29 +05:30
harshanl
1c8bb7551d Refactored Dynamic-client registration service to use AppMgt osgi service 2015-10-07 23:15:17 +05:30
prabathabey
69ba3e83ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-07 17:01:33 +05:30
prabathabey
774683a418 Adding proper dependency exclusions 2015-10-07 17:01:27 +05:30
harshanl
134a13727f updated cxf version & fixed migration issues 2015-10-07 16:58:09 +05:30
harshanl
36ca79d31a Fixed build issues 2015-10-07 00:17:17 +05:30
harshanl
302eb3a8a9 Merged changes 2015-10-07 00:00:28 +05:30
harshanl
429b738dba Fixed issues in permission tree' 2015-10-06 22:41:59 +05:30
harshanl
f6c65dd481 Refactored dynamic-client registration code 2015-10-06 13:15:40 +05:30
harshanl
52e0a43b5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-06 11:44:46 +05:30
harshanl
77f5f466d6 Added scope validator and refactored code 2015-10-06 11:44:40 +05:30
prabathabey
c74a979c8d Bumping the versions of all dependent component versions to their respective latests 2015-10-05 20:34:43 +05:30
Dilshan Edirisuriya
0d259b2a6e Enabling SAML 2015-10-05 11:34:14 +05:30
harshanl
648d8ec209 Added OAuth scope validator & fixed DataHolders 2015-10-05 11:28:47 +05:30
harshanl
234cd47931 Added identity-extensions 2015-10-02 18:00:05 +05:30
milanperera
17112c3616 Removed unused constants 2015-10-02 17:12:14 +05:30
milanperera
e408d50037 Refactored permission module 2015-10-02 17:07:57 +05:30
milanperera
a0187b905b Removed unneccessary imports and code segments 2015-10-02 16:57:42 +05:30
milanperera
a84edd7a99 Added seperate permission tree class 2015-10-02 16:40:52 +05:30
milanperera
02ad7fb8e1 Refactored authorization module 2015-10-02 16:40:13 +05:30
prabathabey
d79de19176 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-01 19:24:54 +05:30
prabathabey
bce52e54a3 Upgrading dependency versions to their respective latests 2015-10-01 19:24:48 +05:30
milanperera
ed937467cd Refactored permission authorizer module 2015-10-01 17:35:08 +05:30
milanperera
68befaae01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-01 12:14:28 +05:30
harshanl
335f53f01c refactored pom files 2015-09-29 17:33:35 +05:30
harshanl
cb9616b02b Refactored dynamic-client registration 2015-09-29 16:34:28 +05:30
mharindu
9813816fab Fixed bug of adding operations 2015-09-29 16:24:35 +05:30
milanperera
1034eb85c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-28 16:55:50 +05:30
mharindu
0a321e279a Added null check to getLicense 2015-09-24 14:37:52 +05:30
Dilshan Edirisuriya
9ce1c2002a Null check in DAO 2015-09-22 14:09:59 +05:30
milanperera
49016cbc56 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-17 11:09:39 +05:30
milanperera
126c2ec371 Implemented permission authorizing module 2015-09-17 11:09:31 +05:30
Dilshan Edirisuriya
c52dfb460a Removing import 2015-09-16 18:58:57 +05:30
milanperera
47ac0b1146 Fixed conflicts and merged local changes 2015-09-15 10:22:53 +05:30
Dilshan Edirisuriya
ac5a7f4ab1 Null check in JWT authenticator and fixing tenant id issue in device DAO 2015-09-14 17:12:07 +05:30
milanperera
37854a2cef Partial Commit 2015-09-14 15:51:23 +05:30
Dilshan Edirisuriya
5f2ec88300 Changes in certificate managment 2015-09-14 15:28:28 +05:30
Dilshan Edirisuriya
3907c0fba2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-14 15:23:18 +05:30
Dilshan Edirisuriya
4a03c7abf7 certificate authentication changes 2015-09-14 15:23:11 +05:30
harshanl
b8720917e1 Added Dynamic-client-registration module 2015-09-11 20:53:19 +05:30
milanperera
3de2591444 Partial commit 2015-09-10 11:36:18 +05:30
milanperera
517039cccb Partial commit 2015-09-10 11:20:29 +05:30
mharindu
9920f2919a Fixed spelling mistakes of policy component 2015-09-09 20:00:10 +05:30
mharindu
b33925c497 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-09 19:57:07 +05:30
Dilshan Edirisuriya
e1a74e049d Bypassing URLS 2015-09-09 17:16:26 +05:30
Dilshan Edirisuriya
d17f1356e7 Certificate authenticator changes 2015-09-08 17:21:23 +05:30
milanperera
3cb68355b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-08 11:29:05 +05:30
mharindu
fbd697edb0 Fixed issue in policy delegation executor 2015-09-08 11:27:29 +05:30
mharindu
2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-08 11:16:41 +05:30
harshanl
1193eff974 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-07 18:14:34 +05:30
harshanl
bf0e95fa6c Fixed notification service issues 2015-09-07 18:14:20 +05:30
Dilshan Edirisuriya
ccffdb2252 Get attribute implementation 2015-09-07 15:15:59 +05:30
milanperera
3c89293220 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-07 12:43:54 +05:30
milanperera
8d38c37d53 Fixed conflicts and merged 2015-09-07 12:39:51 +05:30
harshanl
330f059a09 Added App-Mgt config testcases 2015-09-05 01:26:52 +05:30
mharindu
3421663724 Fixed conflics and merged 2015-09-04 11:15:59 +05:30
geethkokila
4500aacd38 Adding the scep support for getting the device tenant id 2015-09-03 23:38:27 +05:30
mharindu
2f5ef48fa8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:51:12 +05:30
geethkokila
d2fe9679e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:49:39 +05:30
geethkokila
11ead87a5e Fixing the policy listing issue 2015-09-03 20:49:26 +05:30
mharindu
0e7ff3c0c8 Merged 2015-09-03 20:40:49 +05:30
hasuniea
0c0d54f041 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:20:10 +05:30
hasuniea
581c4f013b refactored changes 2015-09-03 20:19:28 +05:30
mharindu
59654848ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:16:17 +05:30
prabathabey
bd6316d8b5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:15:07 +05:30
prabathabey
dbf95bcc7c Fixing an issue in the logic of authentication incoming requests 2015-09-03 20:14:45 +05:30
milanperera
23bb023686 Partial Commit for Permission Authorizer module 2015-09-03 12:07:55 +05:30
mharindu
069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 12:03:41 +05:30
harshanl
30dfa7600e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 00:20:49 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
prabathabey
46c5f2534f Fixing NoSuchElement exception thrown when standard context is accessed 2015-09-03 00:18:39 +05:30
mharindu
7a801c46eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 22:58:48 +05:30
geethkokila
6ef4bdd73e Fixing enrolment id issues 2015-09-02 22:55:52 +05:30
mharindu
5bcc020b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 22:35:40 +05:30
prabathabey
dc2680ac5e Making APIPublisher util compose the relevant API endpoint url programmatically 2015-09-02 21:21:51 +05:30
prabathabey
256c42243f Improving APIPublisher implementation 2015-09-02 21:12:06 +05:30
prabathabey
9288e3846d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 20:26:01 +05:30
prabathabey
4334994b36 Fixing issues encountered in APIPublisher implementation 2015-09-02 20:25:52 +05:30
harshanl
d7ea5625bc Fixed apimgt publisher component issues 2015-09-02 20:24:33 +05:30
mharindu
6418c55f4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 19:58:55 +05:30
geethkokila
bdf976ad2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 19:40:09 +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
prabathabey
2f22d1c82a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 19:03:13 +05:30
prabathabey
f2635e9e98 Adding more improvements into web-app authenticator framework 2015-09-02 18:59:36 +05:30
mharindu
97987f6e10 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 17:45:27 +05:30
mharindu
cbf10a8b59 Refactored addOperation method 2015-09-02 17:35:41 +05:30
hasuniea
7642112a9f code clean up 2015-09-02 17:27:28 +05:30
Prabath Abeysekara
ee0e9af4cb Merge pull request #27 from milanperera/master 
Fixing issues of previous PRs
 2015-09-02 17:19:05 +05:30
Dilshan Edirisuriya
673ef32535 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 16:46:59 +05:30
Dilshan Edirisuriya
454c459172 Extract certificate from signature 2015-09-02 16:46:51 +05:30
mharindu
0c43338f5d Added runtime exception to DCA 2015-09-02 16:16:18 +05:30
mharindu
1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:34:11 +05:30
prabathabey
aa6f311d26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:25:58 +05:30
prabathabey
46c5dba5c5 Improving web-app authenticator framework 2015-09-02 15:24:53 +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
hasuniea
9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 14:26:15 +05:30
mharindu
8503a997ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 10:40:30 +05:30
Dilshan Edirisuriya
aeae7a09f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 10:39:58 +05:30
Dilshan Edirisuriya
0140974487 Certificate verification 2015-09-02 10:39:51 +05:30
harshanl
e1da84ec55 Added JWT authenticator 2015-09-01 22:48:35 +05:30
mharindu
725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 18:20:09 +05:30
geethkokila
f2b8f978f5 Fixing the operations connection close problems 2015-09-01 18:15:02 +05:30
mharindu
cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 17:20:12 +05:30
geethkokila
f4b2a9ca3a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 17:17:05 +05:30
geethkokila
b14461a5af Fixing the datasource issue in the device magt core 2015-09-01 17:16:51 +05:30
Dilshan Edirisuriya
d2182e7375 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 16:13:24 +05:30
Dilshan Edirisuriya
d5199dbd62 Fixing issues 2015-09-01 16:13:17 +05:30
mharindu
ad5335c9f5 Fixed local conflicts and merged 2015-09-01 15:29:24 +05:30
mharindu
6385c13012 Fixed issues in DeviceDAO 2015-09-01 15:25:16 +05:30
geethkokila
6c5f7d7ada Fixing conflicts and checkcriterion method 2015-09-01 15:14:40 +05:30
prabathabey
26cf4e82da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 15:07:21 +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
a7e3462e91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 14:13:06 +05:30
Dilshan Edirisuriya
39d1af7242 Saving in keystore 2015-09-01 13:25:19 +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
Dilshan Edirisuriya
b391681438 Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 11:19:10 +05:30
Dilshan Edirisuriya
3d736d628e adding conf file to touchpoint 2015-09-01 11:19:04 +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
c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 17:13:42 +05:30
harshanl
23c931f5f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 16:17:55 +05:30
harshanl
20873e7786 Added null checks 2015-08-31 14:37:44 +05:30
Dilshan Edirisuriya
c547d85f35 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 11:57:07 +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
Your Name
b906d43cc8 Committing tenant configuration manager service 2015-08-29 22:14:07 +05:30
geethkokila
bcb2c1ddb1 Commiting the monitoring changes and test case changes 2015-08-29 17:39:07 +05:30
Dilshan Edirisuriya
fd84190342 Adding certificate management components 2015-08-28 15:08:16 +05:30
geethkokila
44b496d350 Partially commiting due to update 2015-08-28 12:33:10 +05:30
hasuniea
7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:22:07 +05:30
mharindu
69cf3f8939 Cleaned code and added comments 2015-08-27 17:15:37 +05:30
mharindu
abc16557dc Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:45:10 +05:30
mharindu
460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:43:52 +05:30
mharindu
94326323bc Added class level and method level comments for Policy core 2015-08-27 01:00:59 +05:30
harshanl
aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps 2015-08-26 18:20:37 +05:30
mharindu
7fed00a14d Removed unnecessary logs and added null checks in MonitoringManager 2015-08-26 18:10:10 +05:30
mharindu
8c748b3dfd Removed unnecessary comments 2015-08-26 17:45:21 +05:30
mharindu
97c19c23b0 Added method level comments and null checks in DCA 2015-08-26 17:14:12 +05:30
mharindu
5e285071d8 Removed unnecessary white spaces 2015-08-26 15:16:29 +05:30
hasuniea
9f6dd55223 fixed issue in modify enrollment 2015-08-26 14:05:21 +05:30
mharindu
a51e7646e3 Fixing issues of previous PRs 2015-08-26 12:48:53 +05:30
harshanl
1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-25 09:47:11 +05:30
prabathabey
3582973f84 Code cleanup 2015-08-24 11:04:47 +05:30
prabathabey
d4c5d9023e Adding necessary instructions for transaction handling 2015-08-24 11:04:28 +05:30
prabathabey
de2c378214 Code cleanup 2015-08-24 10:15:50 +05:30
prabathabey
f66d1dd07b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:14:22 +05:30
harshanl
423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:05:24 +05:30
prabathabey
ce0cc1699f Fixing more transaction handling related issues 2015-08-23 20:19:20 +05:30
Dilshan Edirisuriya
6cff144573 Merge pull request #26 from milanperera/master 
Added null check to MonitoringManagerImpl
 2015-08-22 05:16:26 +05:30
mharindu
fa82a28c0f Added null check to MonitoringManagerImpl 2015-08-22 05:15:05 +05:30
prabathabey
2311572d49 code cleanup 2015-08-22 04:48:24 +05:30
prabathabey
cd31662a96 Fixing transactional anomalies found in PolicyManagerImpl 2015-08-22 04:42:35 +05:30
prabathabey
05c3d080e0 Fixing transactional anomalies found in PolicyManagerImpl 2015-08-22 04:09:59 +05:30
prabathabey
cdbdc86f42 Fixing transactional anomalies and code cleanup 2015-08-22 03:56:44 +05:30
harshanl
076d60ec83 PermissionManager changes 2015-08-22 03:01:20 +05:30
prabathabey
d7e363cef7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-22 01:51:56 +05:30
prabathabey
00807e8295 Fixing transaction anomalies and code clean up 2015-08-22 01:51:42 +05:30
Prabath Abeysekara
a5c9886c63 Merge pull request #25 from milanperera/master 
Fixed "204 Content Not Found" issue in LicenseManager
 2015-08-22 00:51:12 +05:30
mharindu
f36c82b059 Refactored LicenseManager 2015-08-22 00:47:17 +05:30
mharindu
4709107719 Refactored LicenseManager 2015-08-22 00:31:18 +05:30
mharindu
8949992148 Fixed 204 issue in LicenseManager 2015-08-22 00:12:24 +05:30
Dilshan Edirisuriya
3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
Conflicts:
	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
 2015-08-21 14:53:36 +05:30
Dilshan Edirisuriya
5b46a4e2f8 Commenting out unreachable state for now 2015-08-21 14:46:49 +05:30
geethkokila
cceb3ac5db Fixing errors and adding caching sketch 2015-08-21 12:09:32 +05:30
dilanua
4e5a38998d Updating DAO Layer 2015-08-07 22:09:51 +05:30
dilanua
df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus 2015-08-07 18:13:42 +05:30
geethkokila
90f8f4aab6 Adding test cases and fixing some logic issues and fixing the null pointer from the policy core 2015-08-07 13:03:34 +05:30
geethkokila
149b743a2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-07 12:27:43 +05:30
harshanl
58c45c92be Fixed tenant configuration persisting issue 2015-08-06 18:11:40 +05:30
geethkokila
c039adf4ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-03 18:21:10 +05:30
prabathabey
c41f6c3002 Code cleanup 2015-08-03 17:22:46 +05:30
geethkokila
3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 23:32:12 +05:30
milanperera
e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp) 2015-07-30 18:34:56 +05:30
milanperera
508082808c Fixed a bug in commons.licence 2015-07-30 17:10:12 +05:30
milanperera
596a99d412 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 16:57:21 +05:30
prabathabey
84bc22f9f3 Setting default values for fields validFrom and validTo 2015-07-30 16:56:45 +05:30
milanperera
05a2339cea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 16:17:11 +05:30
prabathabey
536e13b0a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 15:17:03 +05:30
prabathabey
53302070e6 Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl 2015-07-30 15:16:12 +05:30
milanperera
df61f9263a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 10:19:07 +05:30
geethkokila
cb489c0174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-29 19:52:59 +05:30
Dilshan Edirisuriya
37763b7e40 Importing org.wso2.carbon.device.mgt.common 2015-07-29 11:43:45 +05:30
milanperera
9fcea34d73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-29 08:31:33 +05:30
geethkokila
b8462b02ac Fixing the conflicts 2015-07-29 07:30:14 +05:30
prabathabey
c134cc7e25 Fixing license manager initialization related issues and code cleanup 2015-07-28 20:38:02 +05:30
prabathabey
ca38cc9f51 Removing URL printer start-up handler from device.mgt.core 2015-07-28 18:09:49 +05:30
prabathabey
c471017c40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-28 17:25:54 +05:30
prabathabey
134b4ae53c Code cleanup 2015-07-28 17:25:41 +05:30
Dilshan Edirisuriya
e7f02365a8 Importing axis2.transport.mail 2015-07-28 16:42:20 +05:30
milanperera
c0b0975929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-28 15:35:00 +05:30
milanperera
63721cb79d Refactored 2015-07-28 15:34:38 +05:30
prabathabey
54cd6b80f4 Fixing merge conflicts 2015-07-28 15:21:06 +05:30
prabathabey
955c119006 Adding policy delegation 2015-07-28 15:19:34 +05:30
geethkokila
dc205aa081 Fixing the conflicts 2015-07-27 20:32:12 +05:30
geethkokila
6d687364c6 Fixing the monitoring tasks 2015-07-27 12:27:12 +05:30
milanperera
256880089e Merged 2015-07-27 11:16:03 +05:30
milanperera
f0ec3dbe4c Fixed NPE issues in policy-mgt 2015-07-27 10:49:46 +05:30
prabathabey
b298407160 Fixing improper parent configurations found in apimgt.extensions component and feature 2015-07-25 13:29:57 +05:30
prabathabey
1716c2c7f6 Making apimgt extensions module a separate component/feature pair 2015-07-25 12:41:18 +05:30
prabathabey
1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module 2015-07-24 19:22:14 +05:30
prabathabey
bfa1ea1875 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-24 12:36:35 +05:30
milanperera
5b2e0c8989 Merged 2015-07-24 12:32:26 +05:30
geethkokila
fde54d2d32 Fixing the monitoring service 2015-07-24 12:26:57 +05:30
prabathabey
a68ca0cfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-24 12:08:12 +05:30
prabathabey
8394b63e0c Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions 2015-07-24 12:07:57 +05:30
milanperera
7ec10d670c Fixed bugs in device disenrolment 2015-07-23 17:32:05 +05:30
milanperera
5a8975d7ac Partial Commit 2015-07-23 16:55:54 +05:30
milanperera
35ce4be1a1 Partial Commit 2015-07-23 15:55:32 +05:30
geethkokila
fcb7530d3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-23 15:32:27 +05:30
geethkokila
2769392bc0 Fixing the monitoring task for not to notify the blocked and inactive devices 2015-07-23 15:32:12 +05:30
Prabath Abeysekara
3512e3e60a Merge pull request #20 from milanperera/master 
Refactored SQL queries
 2015-07-23 14:50:57 +05:30
milanperera
6f56e27f1d Refactored SQL queries 2015-07-23 14:46:22 +05:30
prabathabey
6c857fdc4d Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications 2015-07-23 14:35:02 +05:30
geethkokila
bd75f70a24 Fixing the merge conflicts 2015-07-23 10:17:04 +05:30
geethkokila
6270dff93c Fixing priviledege carbon context issue in device-mgt component 2015-07-23 10:14:24 +05:30
prabathabey
d9459b09ba Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-23 10:02:02 +05:30
prabathabey
fac53e4814 Upgrading tomcat version usd in carbon-devicemgt 2015-07-23 10:01:56 +05:30
prabathabey
9e5e3cf73d Enforcing proxy port to be used when configured 2015-07-23 09:57:50 +05:30
prabathabey
e4fd0607e8 Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code 2015-07-22 23:43:12 +05:30
prabathabey
15d56e29c3 temporarily commenting out test cases till tenancy-test bits are properly added 2015-07-22 23:41:05 +05:30
geethkokila
8ab843e76c Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master 
Merging the milan's changes
 2015-07-22 17:59:45 +05:30
milanperera
35ac8ec6c9 Fixed formating issues in PolicyManagerImpl 2015-07-22 17:53:58 +05:30
milanperera
de6572d819 Fixed for JIRA MDM-372 2015-07-22 17:46:40 +05:30
geethkokila
9dc5a1e2e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-22 17:24:50 +05:30
geethkokila
aee2402d0d Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home 2015-07-22 17:24:33 +05:30
harshanl
c2ef90d399 added class comments 2015-07-22 15:47:25 +05:30
harshanl
50640c9dfd Added tenant configuration persistance 2015-07-22 15:36:16 +05:30
geethkokila
397fb7113e Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master 2015-07-21 19:51:28 +05:30
milanperera
7313ba1e7e Implemented policy monitoring add operation 2015-07-21 19:43:22 +05:30
prabathabey
7d089d8b09 Removing IDE warnings 2015-07-21 19:13:16 +05:30
prabathabey
a461e887d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-21 19:12:34 +05:30
prabathabey
87e632866b Fixing connection leaks spotted in operation management implementation 2015-07-21 19:12:22 +05:30
harshanl
00b9303283 Fixed the issue with java package name 2015-07-21 10:26:24 +05:30
geethkokila
c4739efd0e Fixing the policy monitoring service adding 2015-07-20 19:05:13 +05:30
geethkokila
9ca5815ec3 Fixing the saving issues 2015-07-20 16:47:25 +05:30
harshanl
57299063b3 Added policy configuration to the cdm-config 2015-07-20 11:16:15 +05:30
geethkokila
e0301e4ce3 Adding the 90% completed monitoring task 2015-07-20 10:49:37 +05:30
manoj
4049d1a2b4 Remove properties from config operations 2015-07-20 09:39:38 +05:30
geethkokila
38939d6c7b Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master 2015-07-16 22:56:32 +05:30
prabathabey
ff2c29a158 Registering license managment service 2015-07-16 19:57:03 +05:30
manoj
ac3438e2cd Code refactor application update 2015-07-16 13:17:43 +05:30
milanperera
05fd385d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-16 12:11:23 +05:30
manoj
f8c1cbc405 change generated keys to prepared statement constant 2015-07-16 01:01:07 +05:30
manoj
b0a55a55c8 code clean up 2015-07-15 20:41:10 +05:30
milanperera
f14ba29d30 Merged 2015-07-15 13:57:32 +05:30
milanperera
854b7dda8d Merged 2015-07-15 13:56:21 +05:30
manoj
a6cee6bae3 change update operation response to object 2015-07-15 12:44:55 +05:30
manoj
3bbbed40e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-15 12:11:58 +05:30
manoj
25a8f60d74 Retuen int for operations 2015-07-15 12:11:00 +05:30
kasundananjaya
2d1433a2f0 Merge pull request #16 from milanperera/master 
Refactored dynamic-client-registration unregister function
 2015-07-15 12:05:29 +05:30
manoj
27279426f0 code clean up 2015-07-15 11:02:54 +05:30
manoj
00819fe4b6 Unit tests, application update 2015-07-15 07:38:13 +05:30
manoj
de17217303 Unit tests, application update 2015-07-15 07:37:20 +05:30
milanperera
a82351f53f Refactered getDevicesByType query 2015-07-14 20:31:37 +05:30
milanperera
a5a9d02dee Implemented getDeviceByStatus function 2015-07-14 19:39:03 +05:30
manoj
6daa71771c Unit tests for service layer 2015-07-14 17:12:45 +05:30
milanperera
eeca0d4ded Refactored DCA 2015-07-14 14:55:18 +05:30
milanperera
1d18c6de1e Refactored DCA 2015-07-14 14:43:01 +05:30
manoj
41d1408b14 Add application update and unit tests 2015-07-14 11:00:16 +05:30
manoj
da61c08fac Add application update and unit tests 2015-07-14 10:59:39 +05:30
mharindu
0a671373e5 Merged with local changes 2015-07-13 17:37:04 +05:30
mharindu
9d8c52958d Refactored SQL queries and added null checks 2015-07-13 17:24:45 +05:30
geethkokila
d048913e06 Adding the momitoring task partialy 2015-07-13 10:55:27 +05:30
prabathabey
a886430005 Initializing Device Management providers 2015-07-09 22:17:22 +05:30
prabathabey
fd6793a9af Fixing device management API structure 2015-07-09 22:07:15 +05:30
prabathabey
8073d46f58 Cleaning up Dynamic Client Registration implementation 2015-07-09 15:37:27 +05:30
prabathabey
85aec417e5 Setting target version of maven compiler plugin to 1.7 2015-07-08 23:23:45 +05:30
mharindu
52b4902aa5 Refactored dynamic-client-registration unregister function 2015-07-08 22:27:24 +05:30
prabathabey
2dc1c7341a Improving the current dynamic client authentication to be more spec compliant 2015-07-08 21:28:51 +05:30
mharindu
440194632c Implemented dynamic-client-authentication unregister function 2015-07-08 17:01:02 +05:30
manoj
0e2e0fdd0e Remove package attribute form Application 2015-07-08 14:18:04 +05:30
Dilshan Edirisuriya
3908705b68 Null check 2015-07-07 18:18:23 +05:30
prabathabey
d5119aba56 Fixing more issues in poms 2015-07-07 13:24:26 +05:30
prabathabey
aaa3e49956 dynamic-client-manager/pom.xml 
Adding proper names to poms
 2015-07-07 13:21:42 +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
prabathabey
dea6d12173 Fixing more issues in SQL queries used in DeviceDAOImpl 2015-07-06 19:36:21 +05:30
prabathabey
043440eb76 Fixing an invalid table name used in getDevices() method 2015-07-06 18:59:57 +05:30
manoj
286a04dd31 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-06 18:15:54 +05:30
manoj
cc5dd3baa6 Move add application list, get applist methods to applicationServiceProvider 2015-07-06 18:15:04 +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
8f9259f346 Doing a patial commit 2015-07-06 14:45:06 +05:30
manoj
66afd0be4b Change updateApplicationList method 2015-07-06 14:03:37 +05:30
manoj
a8ae030fe7 Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins 2015-07-06 13:20:34 +05:30
geethkokila
714ddc51a5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-06 12:04:44 +05:30
geethkokila
3c73bba40c Commiting ppartialy to get updates 2015-07-06 12:04:35 +05:30
prabathabey
431c86ae0e Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console 2015-07-06 11:50:38 +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
7a6e947810 Making Device object return enrolment data too 2015-07-04 14:52:32 +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
harshanl
952db0183d Moved updateApplicationListOfDevice method to DeviceMgtService 2015-07-03 18:13:02 +05:30
Dilshan Edirisuriya
8c59d82708 Making serializable 2015-07-03 16:30:55 +05:30
harshanl
20a9d1222f Added a method to retrieve list of applications installed on a device 2015-07-03 14:35:26 +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
manoj
d30048d94d change properties 2015-07-03 11:43:59 +05:30
manoj
65b1ea70ab Add properties to store mobile app specific meta data 2015-07-02 18:07:35 +05:30
manoj
567f78abb6 Add additional fields to load device 2015-07-02 15:06:18 +05:30
prabathabey
d28de90679 Fixing an invalid database table name used in DeviceDAOImpl 2015-06-30 12:35:25 +05:30
manoj
f3dd402e4b Set device status to active when poll operations 2015-06-25 21:13:55 +05:30
manoj
6263a550ff Set device enrolment status 2015-06-25 20:25:08 +05:30
manoj
65620a7389 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-06-23 13:33:46 +05:30
manoj
83698e7a99 AppList update for device 2015-06-23 13:30:24 +05:30
manoj
1aa22b29c5 AppList update for device 2015-06-23 13:02:20 +05:30
manoj
4510a954a5 AppList update for device 2015-06-23 13:02:06 +05:30
prabathabey
1dd9134e5d Fixing poms to remove device.mgt.user.* dependencies 2015-06-23 01:06:16 +05:30
prabathabey
22bf894d45 Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository 2015-06-23 00:58:42 +05:30
manoj
78ee8e334f Remove app list update method from app manager interface 2015-06-22 22:03:23 +05:30
manoj
6f2c51ee36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-06-22 21:22:16 +05:30
manoj
82cbbef83b Application list saving method and device operation response saving 2015-06-22 21:21:50 +05:30
prabathabey
60ee259b2b Fixing DeviceDAOs to associate tenant id to filter out tenant specific resources 2015-06-22 20:36:31 +05:30
manoj
0e18ebcf4e Synchronize plugin register 2015-06-19 17:35:15 +05:30
manoj
aa8de8cb23 Add all registerd devices to newly registerd plugin listner 2015-06-19 14:23:32 +05:30
manoj
7497a1d033 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-06-19 11:38:25 +05:30
manoj
856fea3455 fix instansiating of device provider serviceImpl with empty plugin repo 2015-06-19 11:37:58 +05:30
prabathabey
c0cbc59a03 Code cleanup 2015-06-18 18:44:08 +05:30
prabathabey
a2dc916fd0 Fixing issues in plugin initialization as a result of certain plugins getting initialized after the device management component is done getting configured 2015-06-18 18:32:14 +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
prabathabey
67c3c7f9a5 Fixing issues in handling requests that are not bound to an appropriate authenticator type 2015-06-12 18:03:48 +05:30
Geeth
89262ef1d4 Merge pull request #14 from milanperera/master 
Fixed an issue in policy based on ownership type
 2015-06-12 13:10:53 +05:30
manoj
0de6ff09e7 Change get device by name query 2015-06-09 16:37:52 +05:30
manoj
21ea3a4428 change device type query 2015-06-09 16:33:09 +05:30
manoj
651cfdc6cb Check if pending operations empty 2015-06-08 17:30:45 +05:30
manoj
61ebf6beb4 Remove status field from get next operations query 2015-06-08 15:41:28 +05:30
manoj
6a1cf1b3f8 Remove status field from get next operations query 2015-06-08 15:24:11 +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
Dulitha Wijewantha
34a8641582 * Added update device implementation 2015-05-30 22:11:43 +05:30
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
0f7df72167 Cast to operation type in dto convertion 2015-05-30 01:54:04 +05:30
manoj
245d3706a2 Invoke policy operation dao 2015-05-30 01:16:47 +05:30
manoj
e948075bc5 Invoke policy operation dao 2015-05-30 01:07:44 +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
manoj
14c6773b57 Fetch device according to the device identifier 2015-05-29 22:26:09 +05:30
manoj
39b85a3b44 update operation status 2015-05-29 21:58:15 +05:30
manoj
0ed9c46a64 set operation status 2015-05-29 20:07:24 +05:30