Commit Graph

260 Commits

Author SHA1 Message Date
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
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
manoj
acf33bdbe4 JAX RS Refractor 2014-12-22 20:55:18 +05:30
prabathabey
a6dd8875b5 Fixing build issues 2014-12-22 18:19:20 +05:30
prabathabey
b5eb0f0eb8 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-22 18:16:07 +05:30
prabathabey
982bd830bc adding mobile operations related abstractions 2014-12-22 18:15:52 +05:30
harshanL
87d47c1d93 Refactored code comments 2014-12-22 16:55:11 +05:30
harshanL
0cd90fc349 Added device type to DB when registering the plugin 2014-12-22 16:47:32 +05:30
inosh-perera
72daca5ebd Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-22 14:24:49 +05:30
prabathabey
7f089b2a30 fixing packaging structure of mobile impl module and adding operations manager related interfaces 2014-12-22 14:22:25 +05:30
inosh-perera
b8152d8abe chnaged the version of wso2 carbon dependance 2014-12-22 12:56:36 +05:30
prabathabey
f3a73b453e removing obselete module out of the parent pom of device-mgt component 2014-12-22 11:19:53 +05:30
prabathabey
fea3486084 adding API Everywhere related changes to device-mgt component 2014-12-22 11:12:07 +05:30
harshanL
e60e7b6d7f Fixed issues in Android JAX-RS app 2014-12-18 17:07:10 +05:30
harshanL
0ad9d1bd16 Added device type insert query to h2 database script 2014-12-18 10:52:51 +05:30
harshanL
9ba2c0198c Fixed issues in enrollment process 2014-12-17 18:33:22 +05:30
Geeth Munasinghe
29247f7b50 Removing the unnessacary files from distribution target folder and changing the policy 2014-12-17 15:55:02 +05:30
harshanL
ad10426c11 Added mobile device management service with db schema 2014-12-17 15:43:31 +05:30
Geeth Munasinghe
e4d6070bee Adding the datasources changes 2014-12-17 10:32:46 +05:30
Geeth Munasinghe
28fa871eda Fixing names of the variable names 2014-12-16 18:47:50 +05:30
manoj
3419aba202 change set ploicy method 2014-12-16 18:46:01 +05:30
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