Commit Graph

8172 Commits

Author SHA1 Message Date
harshanL
3f0f4ffeae Fixed issues in pom file & enrollment 2014-12-10 14:10:04 +05:30
harshanL
267d27745d Merged changes to master 2014-12-09 20:50:44 +05:30
harshanL
d09b37b4ce merged changes to master 2014-12-09 20:45:37 +05:30
prabathabey
458171952e Fixing issues in data types 2014-12-09 20:40:12 +05:30
harshanL
c2f5d79b9c Added Android-REST API implementation changes 2014-12-09 20:37:47 +05:30
prabathabey
ab6c2717c9 fixing Android API util related issues 2014-12-09 20:32:56 +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
Geeth Munasinghe
1d1d5aa42f Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-09 19:29:32 +05:30
Geeth Munasinghe
60f8733c86 Adding the cxf runtime 2014-12-09 19:28:11 +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
40a4f54b9f Android-REST API implementation. 2014-12-09 17:34:37 +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
Geeth Munasinghe
ec91735fa3 Adding test cases for policy management 2014-12-08 19:53:32 +05:30
prabathabey
fce61a59e2 Fixing DeviceManagementRepository initialization related issues 2014-12-08 19:53:01 +05:30
prabathabey
fdd7ca9032 code cleanup 2014-12-08 19:50:11 +05:30
prabathabey
451c38457f code cleanup 2014-12-08 19:22:06 +05:30
prabathabey
e40e836cd4 fixing issues in license headers 2014-12-08 19:00:38 +05:30
prabathabey
a6e9a9834e code cleanup 2014-12-08 18:58:25 +05:30
prabathabey
6db26d9e64 fixing merge conflicts 2014-12-08 18:55:04 +05:30
prabathabey
19256e2638 Impproving the DAO layer, DeviceManagerService SPIs and implmenting initial bits of plugin management 2014-12-08 18:52:26 +05:30
manoj
76e103ef00 DAO Layer Implementation 2014-12-08 17:34:09 +05:30
manoj
3a7bef2170 DAO Implementation Layer 2014-12-08 17:24:29 +05:30
Geeth Munasinghe
33812ec50f Changing the new test frame work to testng 2014-12-08 16:31:10 +05:30
Geeth Munasinghe
eb734a4b14 Changing the policy interface and test case 2014-12-08 15:42:59 +05:30
manoj
9c04828935 DAO Layer Implementation
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
2014-12-08 15:21:32 +05:30
manoj
0b4a6196e0 DAO Layer Implementation 2014-12-08 15:12:07 +05:30
manoj
5216373b97 DAO Layer implementation 2014-12-08 15:11:01 +05:30
manoj
630c065d4e DAO Layer Implementation 2014-12-08 15:09:30 +05:30
manoj
f37df2e6b7 DAO Layer Implementation 2014-12-08 15:08:31 +05:30
manoj
23938f5e0b DAO Layer Impelementation
Conflicts:
	pom.xml
2014-12-08 15:06:56 +05:30
Geeth Munasinghe
d24030dd74 Fixing the compilation failure 2014-12-05 15:10:52 +05:30
Geeth Munasinghe
2c370acfa9 Fixing the compilation failure 2014-12-05 15:09:21 +05:30
inosh-perera
85dffe00bd removed duplicate files 2014-12-05 14:58:11 +05:30
inosh-perera
8464669a23 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-05 14:46:09 +05:30
inosh-perera
df00f34bb0 andoid registration refactor and jax-rs basic implementation 2014-12-05 14:46:00 +05:30
Geeth Munasinghe
28a2cec615 adding the test case class, no implementation is done 2014-12-05 14:41:43 +05:30