prabathabey
733ae8ed10
Adding proper dependency exclusions to poms, making MobileFeatureDAOTestSuite use jdbc pooling instead of dbcp and making testdbconfig.xml to be compliant with platform naming standards
2015-01-26 23:57:06 +05:30
Dulitha Wijewantha
5b68949c41
Merge branch 'master' of github.com:wso2/product-mdm
2015-01-23 22:03:18 +05:30
Dulitha Wijewantha
3f7b93163b
* Added a description to the feature implementation
...
* Added the feature insert, changed the feature_id to int and added device_type to features
* Included the updated database file
* Developed the feature to view device features
* Developed the implementation to call the Operation Manager from the UI
2015-01-23 22:03:01 +05:30
prabathabey
e9ebd88445
Configuring logging for test cases
2015-01-23 21:29:32 +05:30
prabathabey
b17b514d11
Resolving conflicts
2015-01-23 21:08:58 +05:30
prabathabey
da34270a61
Fixing API Manager related issues
2015-01-23 20:53:50 +05:30
harshanL
e40424c758
Added copying mobile db scripts to bin.xml & refactored code
2015-01-23 19:44:16 +05:30
Dulitha Wijewantha
899662c5d5
Merge branch 'master' of github.com:wso2/product-mdm
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileFeatureDAO.java
2015-01-23 19:07:21 +05:30
Dulitha Wijewantha
df09c4bd3c
* Added method to the mobile feature DAO to get features by type
...
* Changed method - getFeaturePropertyOfFeature to accept a string
* Added Device Type to the Feature DAO implementations
* Changed Device Feature properties DAO for Int
* Implemented the get feature by type to android operation manager
2015-01-23 18:39:28 +05:30
harshanL
54e827ce68
Added unit-tests & refactored the code
2015-01-23 15:58:06 +05:30
Dulitha Wijewantha
f1193b5647
Fixed indentation. UI module changes
2015-01-23 12:47:25 +05:30
Dulitha Wijewantha
24184b48a7
Reverted changes back to the list implementation. The Map conversion is not properly supported in CXF
2015-01-23 11:40:06 +05:30
harshanL
ad3f748e0b
Fixed merge conflicts
2015-01-22 22:24:52 +05:30
harshanL
163fe58120
Added new changes in operation management
2015-01-22 22:04:51 +05:30
Dulitha Wijewantha
9f71408001
* Fixed the JNDI bug
...
* Added a device module method and apis for a single device
* UI improvement to the device page
2015-01-22 21:20:08 +05:30
Dulitha Wijewantha
99f7cd25e8
Merging left over changes from MDM. Most of the changes are from @harshahL.
2015-01-22 10:43:36 +05:30
Geeth Munasinghe
bc93ff08a4
Changing cdm to mdm
2015-01-21 20:14:55 +05:30
Geeth Munasinghe
5e3ebc141c
As discussed in the product counsil, the MDM will be the mobile solution built upon CDM framework
2015-01-21 12:44:51 +05:30
Geeth Munasinghe
77016e614c
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2015-01-20 12:02:21 +05:30
harshanL
193eca9e2d
Added operation persistance logic & refactored the code
2015-01-20 11:44:31 +05:30
Geeth Munasinghe
9f789af79f
Fixing git repo issues
2015-01-20 11:41:44 +05:30
Geeth Munasinghe
ce3149bc45
Adding partially completed policy evaluation
2015-01-20 11:10:47 +05:30
manoj
da0351ebcd
Change device type to device type Id
2015-01-20 07:37:39 +05:30
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
