Commit Graph

30 Commits

Author SHA1 Message Date
Dulitha Wijewantha
773fba11bf Merge branch 'master' of github.com:wso2/product-cdm 2015-01-22 09:41:50 +05:30
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
83402a4009 Added the SSO js module feature to the cdm product 2015-01-20 13:42:09 +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
Dulitha Wijewantha
c884cfae23 Code formatting 2015-01-14 16:32:12 +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
manoj
1db2b40790 Android Services Refactor 2015-01-13 10:43:59 +05:30
Geeth Munasinghe
745f83b9ed Fixing pom issues 2015-01-12 16:46:38 +05:30
prabathabey
3f6d5daa16 Fixing start-up issues of CDM distribution 2015-01-11 22:02:37 +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
prabathabey
fea3486084 adding API Everywhere related changes to device-mgt component 2014-12-22 11:12:07 +05:30
prabathabey
231d6f394a adding API manager related features to p2-profile 2014-12-18 21:11:33 +05:30
Geeth Munasinghe
624d6eb6ef adding dbconsole ui to the product - this should be removed when releasing the product 2014-12-17 17:34:58 +05:30
Geeth Munasinghe
bd5971d263 Comminying policy management related code 2014-12-15 20:11:19 +05:30
Geeth Munasinghe
14a3429a19 Fixing cdm-config file adding 2014-12-10 18:04:29 +05:30
prabathabey
5ec8f20baf adding device management mobile feature into CDM p2-profile 2014-12-10 16:54:11 +05:30
harshanL
7eb5b960a9 Fixed issues in pom file 2014-12-10 14:11:37 +05:30
harshanL
3f0f4ffeae Fixed issues in pom file & enrollment 2014-12-10 14:10:04 +05:30
Geeth Munasinghe
ef515289cc Fixing pom issues 2014-12-09 19:57:04 +05:30
Geeth Munasinghe
60f8733c86 Adding the cxf runtime 2014-12-09 19:28:11 +05:30
Geeth Munasinghe
6bc84366f2 Fixing starting problems 2014-12-09 18:53:16 +05:30
Geeth Munasinghe
85fc1adc79 Adding featurs for the device mgt 2014-12-05 12:05:48 +05:30
Geeth Munasinghe
b94d6edfce Fixing pom name issues of cdm product 2014-12-04 16:51:15 +05:30
Niranjan-K
1ee862ed83 Changed carbon.kernal.version to carbon.kernel.version 2014-12-03 15:30:22 +05:30
Geeth Munasinghe
afe087b43b Fixing the licence headers 2014-12-03 14:57:28 +05:30
Geeth Munasinghe
42ab95abdc Adding product folder and moving modules to that folder 2014-12-03 14:31:13 +05:30