Commit Graph

187 Commits

Author SHA1 Message Date
manoj
72a3df080b 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/DeviceManagementRepository.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
	product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java
	product/pom.xml
2015-01-20 07:29:16 +05:30
manoj
aa50bf96ed Add License Mgt 2015-01-19 21:39:06 +05:30
manoj
50a17eb33d Refactor add new mobile service module to as parent to agent module 2015-01-19 21:38:41 +05:30
Dulitha Wijewantha
f340855916 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-19 17:59:01 +05:30
Dulitha Wijewantha
adebf34ff2 Refactored the device id to integer.
Created method to convert dto.device to common.device
Created a bulk method for conversion
Implemented getAllDevices
2015-01-19 17:54:39 +05:30
DilanUA
e093d53b43 Copyright notices of policy-mgt classes were updated. 2015-01-19 15:46:33 +05:30
DilanUA
cbe13288d0 [1] Copyright notices of policy-mgt component classes were updated. [2] Mispelled getJndiLookupDefinition() of org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig was updated. 2015-01-19 15:08:42 +05:30
Dulitha Wijewantha
250c48a258 Fixed an issue of DeviceType and DeviceIdentifier. Implemented the getDeviceType method 2015-01-19 14:32:10 +05:30
harshanL
771575c408 Fixed conflicts in merge 2015-01-19 09:24:52 +05:30
harshanL
207a51a269 Added license headers with changes 2015-01-19 09:20:53 +05:30
prabathabey
74b8a32be3 Fixing exception getting swallowed in activate method of the service component 2015-01-19 01:04:35 +05:30
prabathabey
043bfb7742 Code cleanup 2015-01-19 00:58:41 +05:30
prabathabey
07e3dc9644 Fixing exception getting swallowed in deactivate method of the service component 2015-01-19 00:53:42 +05:30
prabathabey
83c9ae42b5 Fixing NPE thrown at server startup as a result of APIManagerConfigurationService not being available while the JAX-RS services are registered as APIs 2015-01-19 00:48:19 +05:30
prabathabey
b7984c18b6 Code cleanup 2015-01-18 14:34:26 +05:30
prabathabey
29bfc6f09f More code cleanups 2015-01-18 14:16:27 +05:30
prabathabey
5f242d6165 code cleanup 2015-01-18 13:57:36 +05:30
prabathabey
9e695ecc85 Adding test cases to test unregistering a device management service from the device management repository 2015-01-18 13:53:26 +05:30
prabathabey
233f9e8d1f Renaming DeviceMgtDAOTestSuite.java to DeviceManagementDAOTests.java 2015-01-18 13:27:23 +05:30
prabathabey
daa13e3732 Fixing licensing headers 2015-01-18 13:25:32 +05:30
prabathabey
2b1a5dd6c4 code cleanup 2015-01-18 12:58:14 +05:30
prabathabey
f2a80d3ede Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-18 12:46:55 +05:30
prabathabey
a31767d114 Adding test cases for device repository handling and device management config initialization 2015-01-18 12:46:14 +05:30
inosh-perera
b7ca60d802 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-16 20:16:34 +05:30
inosh-perera
40ee310f42 returning auto incremented id 2015-01-16 20:14:48 +05:30
DilanUA
1d45b494f1 Method signature of updatePolicy method in org.wso2.carbon.policy.mgt.common.Policy.PolicyDAO was updated 2015-01-16 19:02:59 +05:30
harshanL
92503ac0fe Added CDM-REST APIs 2015-01-16 17:52:31 +05:30
manoj
7feb390cef Add governance and registry features 2015-01-15 10:59:56 +05:30
manoj
d0603f3e0b Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
	product/modules/p2-profile-gen/pom.xml
2015-01-14 18:42:47 +05:30
prabathabey
2871af5c38 cleaning up poms, removing unused dependencies from pom, declaring missing dependencies 2015-01-14 15:09:40 +05:30
manoj
b2f89320f7 Android JAX RS Refactor 2015-01-13 10:59:10 +05:30
manoj
1db2b40790 Android Services Refactor 2015-01-13 10:43:59 +05:30
prabathabey
aa7d4e4eba Fixing API config initialization issues 2015-01-12 00:11:03 +05:30
prabathabey
717fa6dea8 Restructuring plugin config hierarchy 2015-01-11 23:58:12 +05:30
prabathabey
72dfc1ea14 Fixing more server start-up issues caused by not having proper package exports configured in org.wso2.carbon.device.mgt.mobile.impl as well as not having application-authentication.xml copied into CDM_HOME/repository/conf/security directory 2015-01-11 22:23:24 +05:30
inosh-perera
f2c6eab6a3 OperationDAO, FeaturePropertyDAO, OperationProperty and related implementaions 2015-01-09 10:41:06 +05:30
inosh-perera
1c2ede6be5 adding FeaturePropertyDAO and related implementation classes 2015-01-07 09:43:00 +05:30
prabathabey
d015b9a960 Pom cleanup 2015-01-06 22:00:36 +05:30
inosh-perera
d51669539a Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-06 20:46:35 +05:30
prabathabey
da792f96d8 Enabling surefire plugin 2015-01-06 19:44:01 +05:30
prabathabey
03e9bd341e Code cleanup 2015-01-06 19:38:55 +05:30
inosh-perera
4f16f32269 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-06 18:59:23 +05:30
inosh-perera
f103b73367 adding featureDAO classes and unit tests 2015-01-06 18:58:03 +05:30
Geeth Munasinghe
ff859eaf19 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-06 10:08:36 +05:30
manoj
f01f822f6f Refactor Device Management service exception class 2015-01-05 15:32:02 +05:30
manoj
704afe78ae Delete test classes 2015-01-05 15:31:47 +05:30
inosh-perera
8c613539cc Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-05 14:48:41 +05:30
Geeth Munasinghe
0dd8009471 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-05 10:00:13 +05:30
manoj
0ba84713cd Correct copy right text and refactor 2015-01-05 02:25:08 +05:30
Geeth Munasinghe
9bddb9407b Fixing pom issues 2014-12-23 15:03:40 +05:30