Commit Graph

823 Commits

Author SHA1 Message Date
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
manoj
f68c7133cf Check null before close connection 2015-05-29 19:56:29 +05:30
manoj
3dcb42ee64 fix connection close issue while call super getOperation method inside loop 2015-05-29 19:40:06 +05:30
manoj
9f592f8a33 fix operation id field issue 2015-05-29 19:06:34 +05:30
manoj
3c99c9ec2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 18:24:59 +05:30
manoj
7fb3a594b8 Instansiate Policy DAO in operations dao factory 2015-05-29 18:23:42 +05:30
prabathabey
6c6f644892 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 17:57:59 +05:30
prabathabey
de9b17f41f Modifying Device bean definition 2015-05-29 17:57:45 +05:30
manoj
f8fbbdb467 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 17:51:19 +05:30
manoj
d15f19dab2 correct sql ambiguos selection of operation id 2015-05-29 17:38:19 +05:30
prabathabey
cdcba23021 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-29 17:30:47 +05:30
prabathabey
72e940b523 Code cleanup 2015-05-29 17:30:34 +05:30
manoj
e2ef2504a9 Y
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-05-29 17:00:50 +05:30
prabathabey
d444f4ce0c Adding an interface method to DeviceManager.java to support claimable devices 2015-05-29 16:52:02 +05:30
manoj
54c776000f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-1.0.0 2015-05-29 15:54:51 +05:30
manoj
c3805364c9 Refractor Operations to handle Policy Operations and remove joins 2015-05-29 15:54:40 +05:30
manoj
917c0cf965 Refractor Operations to handle Policy Operations and remove joins 2015-05-29 15:54:15 +05:30
prabathabey
a3e385bd2f Serializing the complete OAuthAPplicationInfo bean 2015-05-28 22:06:40 +05:30
prabathabey
4e17a2669f Fixing more dynamic authentication related issues 2015-05-28 21:44:48 +05:30
prabathabey
e909ac8bcc Fixing issues prompted due to not properly inheriting JAX-RS annotations 2015-05-28 19:58:41 +05:30
prabathabey
ef12414210 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-28 19:47:35 +05:30
prabathabey
cc3f543768 Fixing dyanamic client registration related issues 2015-05-28 19:45:37 +05:30
mharindu
3d549701a4 Fixed query issue in function getDevicesByName 2015-05-28 17:45:11 +05:30
mharindu
3db38b7e17 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-28 15:48:22 +05:30
prabathabey
68cefe21a5 Fixing issues encountered in dynamic client authentication implementation 2015-05-28 15:20:00 +05:30
mharindu
fd0a978eb5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-28 14:55:54 +05:30
mharindu
de8914fdcb Added a function to retrieve device list from device name 2015-05-28 14:55:34 +05:30
prabathabey
e21c92a1ce Code cleanup 2015-05-28 14:54:21 +05:30
prabathabey
6cdd122c97 Adding the initial implementation of dynamic client registration 2015-05-28 14:53:52 +05:30
prabathabey
3c5a3adc2f Fixing failures prompted while invoking APIs that are OAuth protected 2015-05-26 17:08:38 +05:30
manoj
8ee09793f2 Change Bearer regex pattern 2015-05-26 15:34:56 +05:30
manoj
ca4f902185 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-26 15:13:25 +05:30
manoj
eda34cf4de Change logic of token extraction 2015-05-26 15:12:31 +05:30
geethkokila
535c4e4717 Fixing policy deletion 2015-05-26 04:05:20 -04:00
manoj
54290e0ab3 Change OAuthAutheticator to get api version and context 2015-05-26 13:01:20 +05:30
manoj
f2c33f9421 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-22 13:22:37 +05:30
manoj
cfe9bd5f9f Email format 2015-05-22 13:22:00 +05:30
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
dilanua
851fb35554 Updated DeviceTypeDAOImpl.java 2015-05-22 04:28:26 +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
mharindu
ed9eebca52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 23:18:39 +05:30
geethkokila
3382686d52 Fixing policies related issues, and adding the delete policy 2015-05-21 23:17:33 +05:30
mharindu
7b9dba545a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 21:34:54 +05:30
geethkokila
a1f851243c Fixing null pointer issue 2015-05-21 21:33:53 +05:30
geethkokila
37b4e27c42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 20:42:17 +05:30
geethkokila
e07d917ad6 Fixing bugs 2015-05-21 20:41:57 +05:30
mharindu
5c1cff9bb8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 20:08:38 +05:30
prabathabey
486d39e54d Fixing authentication issues surfaced due to not properly configuring WebappAuthenticatorRepository 2015-05-21 20:07:14 +05:30
mharindu
1c4e74f706 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 19:51:41 +05:30
mharindu
695ff8edcb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
	features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
2015-05-21 19:51:32 +05:30
prabathabey
cdcb7d2546 Fixing build failures 2015-05-21 19:49:41 +05:30
prabathabey
abf1e3d2ea Fixing build failures 2015-05-21 19:16:40 +05:30
prabathabey
7942fb4cbb Fixing issues surfaced when a proper authentication scheme is not defined for certain resources 2015-05-21 18:53:02 +05:30
mharindu
6e11c8e112 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:54:30 +05:30
geethkokila
a9d3d15438 Adding pofile operations 2015-05-21 17:46:57 +05:30
mharindu
1904264c0d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:39:56 +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
mharindu
30edad0529 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-21 17:08:15 +05:30
Dulitha Wijewantha
341abb47ab Fixes to the timestamp and filters 2015-05-21 16:48:49 +05:30
prabathabey
c8affcf836 Improving the way webapp requests are authenticated 2015-05-21 15:19:33 +05:30
mharindu
3d69503e96 Merged 2015-05-20 14:25:17 +05:30
geethkokila
4a4349382a Adding the user core changes 2015-05-19 20:45:12 +05:30
mharindu
048c175fda Fixed issue of get device info function 2015-05-19 19:08:24 +05:30
Milan Perera
c068ac88de Update DeviceManagementServiceImpl.java 2015-05-19 17:30:20 +05:30
Milan Perera
7d3bf84d9f Update DeviceManagementServiceProviderImpl.java 2015-05-19 17:26:24 +05:30
Milan Perera
8f00128ab1 Update DeviceManager.java 2015-05-19 17:22:36 +05:30
mharindu
d0819adf6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-19 17:13:57 +05:30
mharindu
40feabb9df Fixed bug in device disenrollment 2015-05-19 17:13:36 +05:30
geethkokila
1d180c1a1e Adding the policy related new tables 2015-05-19 16:00:49 +05:30
mharindu
847eb073b9 Refactored device info 2015-05-19 15:43:15 +05:30
mharindu
ead4d3be69 Refactored device info 2015-05-19 11:19:41 +05:30
manoj
f25dc65b54 Refractor device mgt user core service 2015-05-18 19:30:16 +05:30
manoj
c918622cc6 Refractor Email service and change user server feature name
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
2015-05-18 19:27:41 +05:30
mharindu
6b84d65e29 Refactored updateDeviceInfo function 2015-05-18 15:14:14 +05:30
manoj
63b6a5b206 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 15:03:02 +05:30
manoj
6c80688af2 Remove app list from device info update service 2015-05-18 15:02:18 +05:30
mharindu
0f3a981367 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 11:14:11 +05:30
geethkokila
ebc2e669cc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 07:38:53 +05:30
geethkokila
10a585ea6a Moing interfacs to common bundle and fixing test cases 2015-05-18 07:38:35 +05:30
manoj
2d5d0bb4f8 Install APP service 2015-05-18 02:52:38 +05:30
manoj
94fbb56f06 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-18 02:31:15 +05:30
manoj
3589804ede Installation APP service 2015-05-18 02:31:10 +05:30
geethkokila
be5f161eb5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-17 23:18:31 +05:30
geethkokila
38e09d49bb Fixing bugs and fixing the criteria based policies 2015-05-17 23:18:10 +05:30