550 Commits

Author	SHA1	Message	Date
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
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	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
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	57299063b3	Added policy configuration to the cdm-config	2015-07-20 11:16:15 +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
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
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
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
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