Commit Graph

633 Commits

Author SHA1 Message Date
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