118 Commits

Author	SHA1	Message	Date
Geeth Munasinghe	78cc3b0070	Removing white spaces from the policy management and making data time fileds long	2014-12-16 18:13:06 +05:30
manoj	3ee767f1b2	merge after JAX-RS changes	2014-12-16 16:53:46 +05:30
manoj	37a47ec347	JAX-RS Refractor	2014-12-16 15:13:09 +05:30
Geeth Munasinghe	137023aa8b	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-16 11:11:42 +05:30
prabathabey	674735d9db	code cleanup	2014-12-15 21:06:51 +05:30
prabathabey	f563e1f448	Fixing merge conflicts	2014-12-15 20:55:14 +05:30
prabathabey	a69fc9dc4c	Fixing issues spotted as a result of the bundle getting activated before the datasources used underneath are registered in JNDI	2014-12-15 20:52:38 +05:30
harshanL	95f72f77f1	Commented MobileActivator jndi lookup code	2014-12-15 20:20:11 +05:30
Geeth Munasinghe	e268660540	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-15 20:11:29 +05:30
Geeth Munasinghe	bd5971d263	Comminying policy management related code	2014-12-15 20:11:19 +05:30
harshanL	4a419f3ebf	Added mobile device management related db classes	2014-12-15 20:09:39 +05:30
harshanL	a5018afadf	Making the plugin resolution optional for the core component	2014-12-15 18:43:56 +05:30
manoj	8fa2f38f37	remove EMM DB scripts file	2014-12-15 11:23:06 +05:30
prabathabey	0543d71f6b	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-15 09:57:39 +05:30
prabathabey	0acf34ae51	Fixing DAOFactory initialzation related issues	2014-12-15 09:57:24 +05:30
harshanL	9f5fb3fb91	Added MobileDeviceDAO classes	2014-12-15 09:47:54 +05:30
harshanL	006b07b399	Fixed issues in build & added COPE to enum	2014-12-15 09:41:54 +05:30
manoj	aa2448dd0a	Add device list method and chgange getDevice by Id method return type to device	2014-12-12 20:00:57 +05:30
manoj	18083d2d11	DAO unit tests implementation	2014-12-12 19:56:19 +05:30
manoj	10a05b024f	Device DAO unit tests implementation	2014-12-12 19:55:41 +05:30
manoj	6a86ab43c1	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-12 17:23:04 +05:30
manoj	8ad13b6d0a	Implement DAO unit tests	2014-12-12 17:22:16 +05:30
manoj	c4e2722586	Unit test framework for DAO tests	2014-12-12 17:21:27 +05:30
Geeth Munasinghe	274d9ec37e	Adding the feature management service and android application to webapps	2014-12-12 14:45:24 +05:30
harshanL	80334ef00d	Added new APIs to enrollment	2014-12-11 17:22:32 +05:30
harshanL	6d5ea7f586	Added JSON to Device object conversion	2014-12-11 15:21:18 +05:30
prabathabey	f50e9cebdb	Fixing issues in reading the SQL script associated with CDM related functionalities	2014-12-10 18:07:01 +05:30
prabathabey	f321b133b8	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-10 17:54:10 +05:30
prabathabey	c199f6fe69	Renaming MobileDeviceManagementServiceComponent.java as MobileDeviceManagementBundleActivator.java and adding missing Bundle-Activator header in org.wso2.carbon.device.mgt.mobile.impl pom	2014-12-10 17:53:54 +05:30
harshanL	9697c1fa99	Added comments to the DeviceManagerService interface	2014-12-10 17:10:12 +05:30
harshanL	7c7768101f	Modified Android enrollment APIs and changed isRegistered to isEnrolled	2014-12-10 14:53:15 +05:30
harshanL	d09b37b4ce	merged changes to master	2014-12-09 20:45:37 +05:30
harshanL	c2f5d79b9c	Added Android-REST API implementation changes	2014-12-09 20:37:47 +05:30
prabathabey	441a135acb	Cleaning up constants	2014-12-09 20:28:11 +05:30
Geeth Munasinghe	ef515289cc	Fixing pom issues	2014-12-09 19:57:04 +05:30
prabathabey	066212e19d	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-09 18:55:41 +05:30
prabathabey	81abcefc30	cleaning up poms	2014-12-09 18:55:36 +05:30
Geeth Munasinghe	233c3c60b2	Adding policy mgt daos	2014-12-09 18:54:05 +05:30
Geeth Munasinghe	6bc84366f2	Fixing starting problems	2014-12-09 18:53:16 +05:30
prabathabey	1476036b89	cleaning up constants	2014-12-09 17:56:24 +05:30
harshanL	1d94f81ec6	Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/Device.java	2014-12-09 17:37:32 +05:30
harshanL	18f858ab3a	Added updateDeviceInfo method to DeviceManagerService.	2014-12-09 17:31:27 +05:30
harshanL	4b22589796	Modified DeviceManagerService to return operation status.	2014-12-09 17:30:37 +05:30
prabathabey	81dd70bb6c	cleaning up DAO layer	2014-12-09 16:56:32 +05:30
Geeth Munasinghe	a14980df1c	Changing the policy interface	2014-12-09 14:57:06 +05:30
Geeth Munasinghe	6f79ae79e2	Changing the policy test cases	2014-12-09 12:13:03 +05:30
prabathabey	ee030e136d	Renaming deviceMgt-config.xml as cdm-config.xml	2014-12-08 20:47:23 +05:30
prabathabey	518892fedd	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-08 20:39:50 +05:30
prabathabey	278240b02f	Bridging DeviceManagement core functionalities together with the persistence layer	2014-12-08 20:39:35 +05:30
Geeth Munasinghe	450adc73e2	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-08 19:53:59 +05:30