Commit Graph

205 Commits

Author SHA1 Message Date
milanperera
8d38c37d53 Fixed conflicts and merged 2015-09-07 12:39:51 +05:30
milanperera
23bb023686 Partial Commit for Permission Authorizer module 2015-09-03 12:07:55 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
mharindu
1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:34:11 +05:30
prabathabey
46c5dba5c5 Improving web-app authenticator framework 2015-09-02 15:24:53 +05:30
mharindu
fd29deb372 Fixed conflicts of local repo and merged 2015-09-01 12:57:13 +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
Dilshan Edirisuriya
5a146ed907 POM changes 2015-08-31 14:45:55 +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
Dilshan Edirisuriya
439e0dde6d pom changes to adopt certificate component integrations 2015-08-28 15:31:12 +05:30
Dilshan Edirisuriya
99d3745a9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 15:08:25 +05:30
Dilshan Edirisuriya
fd84190342 Adding certificate management components 2015-08-28 15:08:16 +05:30
geethkokila
cada581396 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:33:15 +05:30
geethkokila
12a2e1f11f Partially commiting to fix update problem 2015-08-28 12:31:03 +05:30
harshanl
ae03025546 Fixed syntax issues in sql scripts 2015-08-27 18:56:58 +05:30
mharindu
8c748b3dfd Removed unnecessary comments 2015-08-26 17:45:21 +05:30
mharindu
8949992148 Fixed 204 issue in LicenseManager 2015-08-22 00:12:24 +05:30
geethkokila
cceb3ac5db Fixing errors and adding caching sketch 2015-08-21 12:09:32 +05:30
geethkokila
90f8f4aab6 Adding test cases and fixing some logic issues and fixing the null pointer from the policy core 2015-08-07 13:03:34 +05:30
geethkokila
b8462b02ac Fixing the conflicts 2015-07-29 07:30:14 +05:30
prabathabey
54cd6b80f4 Fixing merge conflicts 2015-07-28 15:21:06 +05:30
prabathabey
955c119006 Adding policy delegation 2015-07-28 15:19:34 +05:30
geethkokila
dc205aa081 Fixing the conflicts 2015-07-27 20:32:12 +05:30
geethkokila
6d687364c6 Fixing the monitoring tasks 2015-07-27 12:27:12 +05:30
milanperera
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
prabathabey
8fb37722ea Fixing an invalid artifact id used in device management extensions pom 2015-07-24 12:30:30 +05:30
geethkokila
fde54d2d32 Fixing the monitoring service 2015-07-24 12:26:57 +05:30
prabathabey
2694b98883 Adding device management extension feature 2015-07-24 12:19:55 +05:30
milanperera
5a8975d7ac Partial Commit 2015-07-23 16:55:54 +05:30
prabathabey
701228810b 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:25 +05:30
harshanl
57299063b3 Added policy configuration to the cdm-config 2015-07-20 11:16:15 +05:30
milanperera
5a42314855 Added dynamic-client-authentication-feature 2015-07-16 19:58:13 +05:30
manoj
0e2e0fdd0e Remove package attribute form Application 2015-07-08 14:18:04 +05:30
manoj
cc5dd3baa6 Move add application list, get applist methods to applicationServiceProvider 2015-07-06 18:15:04 +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
82cbbef83b Application list saving method and device operation response saving 2015-06-22 21:21:50 +05:30
manoj
917c0cf965 Refractor Operations to handle Policy Operations and remove joins 2015-05-29 15:54:15 +05:30
manoj
cfe9bd5f9f Email format 2015-05-22 13:22:00 +05:30
manoj
7364345a0f Refractor API publish end points 2015-05-21 19:44:23 +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
manoj
880c08885a Add uninstall and install app end points to api publisher 2015-05-21 17:10:05 +05:30
manoj
1bbaac168b change devices API 2015-05-20 14:34:11 +05:30
manoj
1d902cc724 correct end points by adding context 2015-05-20 14:14:52 +05:30
geethkokila
1d180c1a1e Adding the policy related new tables 2015-05-19 16:00:49 +05:30
harshanl
db2065435b Added getAllDevicesOfUser and getAllDevicesOfRole methods with user feature 2015-05-17 17:56:44 +05:30
manoj
1b1b66fc29 Handle DB close within rollback transaction 2015-05-15 15:04:13 +05:30
prabathabey
d5cafe843d Fixing issues related to webapp-authenticator-config.xml not getting copied into the MDM distribution 2015-05-13 22:36:03 +05:30
prabathabey
afbf6a9bf8 Fixing issues related to webapp-authenticator-config.xml not getting copied into the MDM distribution 2015-05-13 22:14:50 +05:30
prabathabey
d76501cf15 Fixing startup issues caused by not properly updating the Carbon-commons version in the parent pom of carbon-devicemgt repository 2015-05-13 20:14:26 +05:30
geethkokila
73b185e1e6 Removing feature implementation from the policy, adding criteria based policy 2015-05-12 16:20:18 +05:30
prabathabey
a4485af0c9 Completing JAX-RS authentication framework implementation 2015-05-11 15:53:20 +05:30
manoj
4f4240f176 Operations Refractor 2015-04-24 12:53:07 +05:30
manoj
d0b553d26a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-24 12:34:20 +05:30
manoj
a46aff84fd fetch command operation enable property 2015-04-24 12:34:04 +05:30
DilanUA
aabe9afff5 Updated back-end email notification functionality 2015-04-21 15:14:48 +05:30
manoj
382b876f7f User Registration email 2015-04-17 20:11:24 +05:30
manoj
20463cca57 User registration email configurations 2015-04-17 19:13:00 +05:30
manoj
3fc11654e7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-04-15 21:41:23 +05:30
manoj
41edb530bc Refactor Operations 2015-04-15 21:40:13 +05:30
Geeth Munasinghe
90ff502b21 Adding the final changes of the policy implementation, Added the simple policy evaluation implementation 2015-04-10 20:10:50 +05:30
Dilshan Edirisuriya
bddf71f2de Temporarily adding device type to the table 2015-04-09 18:54:02 +05:30
manoj
1c80fcd124 Remove paylooad property from Operation 2015-04-08 13:01:43 +05:30
manoj
4a9a27ab7e Refactor operation DAO methods.Add connection close util method 2015-04-07 15:34:10 +05:30
manoj
32b86c7ff1 ADD Operation Code to core operation table 2015-04-06 19:23:26 +05:30
manoj
a32e811183 Update operation DAO implementation 2015-04-06 17:17:20 +05:30
prabathabey
93b88828cc Refactoring Device management related configuration file intialization process to associate appropriate schemas corresponding to each of the said configs 2015-04-03 20:32:15 +05:30
Dilshan Edirisuriya
1f77183bb5 changing the foreign key command 2015-04-02 19:50:51 +05:30
manoj
85b1d4c7d1 Add payload type to profile operation table 2015-04-02 19:25:45 +05:30
prabathabey
53d6dcb8ef Fixing build failures caused by an improper parent pom config 2015-03-26 21:59:55 +05:30
inosh-perera
2002c92032 adding existing API check before publishing 2015-03-26 19:40:00 +05:30
inosh-perera
d242b3ffe1 device list retrival url is added to api auto publishing 2015-03-26 17:58:47 +05:30
inosh-perera
0565c63f2f copying app manager config 2015-03-25 21:00:12 +05:30
inosh-perera
504099a2c4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-25 20:04:22 +05:30
inosh-perera
4a061e7be2 adding App management integeration related code 2015-03-25 20:03:06 +05:30
prabathabey
bcc1cad6e5 Merging Webapp authenticator framework implementation 2015-03-25 18:46:17 +05:30
manoj
fee9fbad7d Refactor Email Functionality 2015-03-24 18:15:45 +05:30
manoj
55d57f6577 Refactor email functionality 2015-03-24 17:57:58 +05:30
manoj
ee6c067398 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-24 17:49:53 +05:30
Dulitha Wijewantha
6d7f6767b5 * Implemented the OperationManager’s mapping of device and operation
* Change method signature of OperationMappingDAO.addOperationMapping to support a list of device id integers
* Removed h2.sql and added them to CreateH2TestDB.sql in the test resources
* Cleaned up the DeviceManagementBaseTest class
2015-03-24 09:36:42 +05:30
manoj
d7aa86cc0b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-23 20:52:54 +05:30
manoj
03b4f41a2e Refactor Email functionality 2015-03-23 20:52:08 +05:30
prabathabey
c40af0de7a Moving API registration bits to device.mgt.core 2015-03-23 18:18:37 +05:30
manoj
0a824d9644 Format enrol email message 2015-03-23 12:16:51 +05:30
manoj
a458c71789 Email format 2015-03-20 19:50:07 +05:30
manoj
28a00cd21c Email functionality 2015-03-20 16:17:51 +05:30
manoj
7c0ca194a1 Email functionality 2015-03-20 16:16:57 +05:30
manoj
78959f0cfb user management 2015-03-20 14:21:04 +05:30
manoj
34ad4a63a2 Email management 2015-03-20 12:27:45 +05:30
manoj
d398b2929c Users functionalities 2015-03-18 18:58:03 +05:30