Commit Graph

1388 Commits

Author SHA1 Message Date
Dulitha Wijewantha
49c490a183 Merge branch 'master' of github.com:dulichan/product-cdm
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceOperationDAOImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileOperationDAOImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidMobileOperationManager.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
	components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
	product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java
	product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
	product/modules/mobileservices/agents/windows/jax-rs/pom.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml
	product/modules/p2-profile-gen/pom.xml
2015-01-22 09:41:03 +05:30
Geeth Munasinghe
462045eac9 Changing the version to 1.0.0 2015-01-21 20:14:04 +05:30
Geeth Munasinghe
23226cc48e As discussed in the product counsil, creating a seperate product for device management framework, this will hold only the core fuctionalities of device management, If some one wants to use this for their device type, they have to use this and write the plugins, uis 2015-01-20 17:30:36 +05:30
Dulitha Wijewantha
cbec06cd35 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-20 13:42:44 +05:30
Dulitha Wijewantha
83402a4009 Added the SSO js module feature to the cdm product 2015-01-20 13:42:09 +05:30
manoj
17457bf6d3 Refactor Agents module 2015-01-20 11:42:32 +05:30
Dulitha Wijewantha
a06f45e8c1 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-14 16:33:20 +05:30
prabathabey
2871af5c38 cleaning up poms, removing unused dependencies from pom, declaring missing dependencies 2015-01-14 15:09:40 +05:30
Dulitha Wijewantha
bee24366eb Added the jaggery feature. Also added copying of the jaggeryapps directory to deployments 2015-01-14 13:56:00 +05:30
Geeth Munasinghe
e29d863a2e Fixing build problems 2015-01-06 14:04:31 +05:30
Geeth Munasinghe
9bddb9407b Fixing pom issues 2014-12-23 15:03:40 +05:30
Geeth Munasinghe
bd5971d263 Comminying policy management related code 2014-12-15 20:11:19 +05:30
prabathabey
5db7698627 removing duplicate declarations of testng related depdendncies from parent pom 2014-12-10 16:58:57 +05:30
Geeth Munasinghe
ef515289cc Fixing pom issues 2014-12-09 19:57:04 +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
prabathabey
19256e2638 Impproving the DAO layer, DeviceManagerService SPIs and implmenting initial bits of plugin management 2014-12-08 18:52:26 +05:30
Geeth Munasinghe
33812ec50f Changing the new test frame work to testng 2014-12-08 16:31:10 +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
23938f5e0b DAO Layer Impelementation
Conflicts:
	pom.xml
2014-12-08 15:06:56 +05:30
Geeth Munasinghe
28a2cec615 adding the test case class, no implementation is done 2014-12-05 14:41:43 +05:30
Geeth Munasinghe
85fc1adc79 Adding featurs for the device mgt 2014-12-05 12:05:48 +05:30
manoj
6e77014e64 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-05 11:11:48 +05:30
manoj
1e6d06027d DAO Layer Implementation 2014-12-05 11:04:16 +05:30
Geeth Munasinghe
578338263c Adding policy management components 2014-12-04 16:41:32 +05:30
manoj
19d4d1f62d DAO Layer Implementation 2014-12-04 11:38:19 +05:30
manoj
2ad0e441e8 DAO Layer Implementation 2014-12-04 11:19:17 +05:30
Geeth Munasinghe
0de1d61244 Changing carbon kernal version 2014-12-03 17:07:45 +05:30
Geeth Munasinghe
f95f72d1a0 Adding components to parent pom 2014-12-03 15:46:34 +05:30
Niranjan-K
7898946170 Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
	pom.xml
2014-12-03 15:34:06 +05:30
Niranjan-K
1ee862ed83 Changed carbon.kernal.version to carbon.kernel.version 2014-12-03 15:30:22 +05:30
Geeth Munasinghe
2b25d2bd2c Fixing pom issues 2014-12-03 15:19:07 +05:30
Geeth Munasinghe
afe087b43b Fixing the licence headers 2014-12-03 14:57:28 +05:30
Geeth Munasinghe
5fdf717849 Removing modules from the root directory 2014-12-03 14:30:05 +05:30
Geeth Munasinghe
637eeb9be3 Fixing pom and refactring 2014-12-03 13:35:16 +05:30
Geeth Munasinghe
d74259c446 Fixing pom formating and build xml 2014-12-03 11:04:38 +05:30
Geeth Munasinghe
60eb7a7a77 initial commit 2014-12-02 18:21:24 +05:30