Commit Graph

1457 Commits

Author SHA1 Message Date
prabathabey
d5f4fe3da0 Fixing build-time warnings induced by having a duplicate dependency declaration for ndatasource.core 2015-04-01 15:20:16 +05:30
manoj
9a1ffa6ab7 Add listner to Data source service 2015-03-27 00:11:21 +05:30
inosh-perera
504099a2c4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-25 20:04:22 +05:30
inosh-perera
4a061e7be2 adding App management integeration related code 2015-03-25 20:03:06 +05:30
prabathabey
bcc1cad6e5 Merging Webapp authenticator framework implementation 2015-03-25 18:46:17 +05:30
prabathabey
3070488adf Fixing Pom issues 2015-03-24 18:28:56 +05:30
prabathabey
c40af0de7a Moving API registration bits to device.mgt.core 2015-03-23 18:18:37 +05:30
manoj
ec6734a1d9 Email management 2015-03-20 12:28:18 +05:30
manoj
232ef4bd90 merge with master 2015-03-18 19:10:09 +05:30
manoj
a41c1421e9 User list 2015-03-18 18:55:56 +05:30
prabathabey
8b5f491d69 Fixing merge conflicts 2015-03-17 17:37:11 +05:30
prabathabey
31b931537f Adding operation and license management implementations 2015-03-17 17:30:30 +05:30
Geeth Munasinghe
ac2fa547d4 [maven-release-plugin] prepare for next development iteration 2015-02-24 14:29:34 +05:30
Geeth Munasinghe
28a1bd9fde [maven-release-plugin] prepare release v0.9.1 2015-02-24 14:29:25 +05:30
Geeth Munasinghe
1a550269f1 Changing the version to 0.9.1-SNAPSHOT 2015-02-24 14:24:16 +05:30
Geeth Munasinghe
835207a13d [maven-release-plugin] prepare for next development iteration 2015-02-23 18:54:54 +05:30
Geeth Munasinghe
7933271193 [maven-release-plugin] prepare release v0.9.1 2015-02-23 18:54:44 +05:30
harshanL
021c27666c Removed governance dependencies 2015-02-21 02:00:55 +05:30
prabathabey
9ad8d6eab9 Refactoring License management functionality 2015-02-18 18:33:18 +05:30
Geeth Munasinghe
60e98f12b2 Adding the bundle activator for PIP 2015-02-13 19:46:08 +05:30
Geeth Munasinghe
05cee229d3 [maven-release-plugin] prepare for next development iteration 2015-02-09 17:45:18 +05:30
Geeth Munasinghe
ba12c63636 [maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2 2015-02-09 17:45:09 +05:30
Geeth Munasinghe
68f5cf6400 [maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2 2015-02-09 17:42:48 +05:30
Geeth Munasinghe
f0511a0b01 [maven-release-plugin] prepare for next development iteration 2015-02-09 17:41:29 +05:30
Geeth Munasinghe
5f72231731 [maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2 2015-02-09 17:41:21 +05:30
Geeth Munasinghe
2c1d1e2a58 Fixing git url 2015-02-09 17:30:54 +05:30
Geeth Munasinghe
13692f6355 [maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2 2015-02-09 15:02:25 +05:30
Geeth Munasinghe
3dd38392b1 [maven-release-plugin] prepare for next development iteration 2015-02-09 14:53:48 +05:30
Geeth Munasinghe
c6d993cee8 [maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2 2015-02-09 14:53:33 +05:30
Geeth Munasinghe
81d6a238c7 Changing the version to 0.9.0 and fixing some issues on poms 2015-02-09 14:51:57 +05:30
Geeth Munasinghe
f494143351 Separating the components from the product-cdm repository, all the commits will be survived. 2015-02-09 14:25:57 +05:30
Geeth Munasinghe
8c5fd85484 Changing the version to 1.0.0-SNAPSHOT 2015-02-09 12:06:04 +05:30
Geeth Munasinghe
0fd9875342 [maven-release-plugin] prepare for next development iteration 2015-02-08 12:30:55 +05:30
Geeth Munasinghe
ab92119231 [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-08 12:30:44 +05:30
Geeth Munasinghe
f453d62001 Fixing the pom file for product to have the same version 2015-02-08 12:26:53 +05:30
Geeth Munasinghe
3e8591cccd Fixing issues in the pom for release purposes 2015-02-08 12:09:09 +05:30
Geeth Munasinghe
c3b26b3f1c [maven-release-plugin] prepare for next development iteration 2015-02-08 11:58:59 +05:30
Geeth Munasinghe
12e49a0b1a [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-08 11:58:49 +05:30
Geeth Munasinghe
4c30dfb9d8 [maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2 2015-02-08 11:54:54 +05:30
Geeth Munasinghe
aad4c8d244 [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-08 11:54:06 +05:30
Geeth Munasinghe
17acce9458 [maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2 2015-02-06 20:32:24 +05:30
Geeth Munasinghe
5254511f5e [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-06 20:31:01 +05:30
Geeth Munasinghe
84fbde538e Fixing pom issues for release works 2015-02-06 20:27:32 +05:30
Geeth Munasinghe
c88ac79541 [maven-release-plugin] prepare for next development iteration 2015-02-05 19:22:54 +05:30
Geeth Munasinghe
8482d4cf27 [maven-release-plugin] prepare release wso2cdm-1.0.0-M2 2015-02-05 19:22:45 +05:30
Geeth Munasinghe
f67eee625a Changing the version to 1.0.0-SNAPSHOT 2015-02-05 19:04:32 +05:30
Geeth Munasinghe
6876d44291 Fixing the pom file 2015-02-05 18:56:34 +05:30
Geeth Munasinghe
da9443a065 [maven-release-plugin] prepare for next development iteration 2015-02-05 16:56:52 +05:30
Geeth Munasinghe
7418cb8d4d [maven-release-plugin] prepare release 1.1.0 2015-02-05 16:56:42 +05:30
Geeth Munasinghe
1942fd68b1 [maven-release-plugin] rollback the release of wso2cdm-parent-1.0.0 2015-02-05 16:50:24 +05:30
Geeth Munasinghe
ae4e56c9d6 [maven-release-plugin] prepare for next development iteration 2015-02-05 16:40:38 +05:30
Geeth Munasinghe
d57c56e36d [maven-release-plugin] prepare release wso2cdm-parent-1.0.0 2015-02-05 16:40:26 +05:30
Geeth Munasinghe
02d1a259df [maven-release-plugin] rollback the release of 1.0.0 2015-02-05 16:18:34 +05:30
Geeth Munasinghe
462e53070c [maven-release-plugin] prepare for next development iteration 2015-02-05 15:58:47 +05:30
Geeth Munasinghe
0d81d60c99 [maven-release-plugin] prepare release 1.0.0 2015-02-05 15:58:37 +05:30
Geeth Munasinghe
ac609f9996 Changing the version to 1.0.0-SNAPSHOT 2015-02-05 14:55:27 +05:30
Geeth Munasinghe
b20bdc1625 A mistake happend to release on the master branch, I am reverting the changes 2015-02-05 12:49:46 +05:30
prabathabey
e3ea0db9c7 Fixing all remaining SNAPSHOT versions except of that of Jaggery SSO feature 2015-02-03 14:49:47 +05:30
harshanL
65fa0fcd61 Fixed the issues in build 2015-02-02 21:49:24 +05:30
prabathabey
d6a22b06ff Fixing more SNAPSHOT versions, used in carbon-governance, carbon-deployment related components 2015-02-02 21:13:52 +05:30
prabathabey
355babd9d5 Changing Carbon commons version to 4.3.2 and Carbon deployment version to 4.3.0 2015-02-01 23:44:43 +05:30
prabathabey
36358ea0b2 More pom clean-ups 2015-01-31 22:31:09 +05:30
prabathabey
5d9fb3b803 Refactoring the poms to remove SNAPSHOT versions of certain dependencies and test clean up 2015-01-31 18:49:56 +05:30
prabathabey
28746cf764 Adding proper dependency exclusions upon automation related dependencies 2015-01-30 17:50:42 +05:30
prabathabey
f91a1b4168 Temporarily fixing automation utils related versions 2015-01-30 17:07:19 +05:30
prabathabey
381ef5d688 Pom refactoring 2015-01-30 16:51:32 +05:30
Geeth Munasinghe
f44b4597db Fixing group ids of the pom files 2015-01-29 20:03:04 +05:30
manoj
10e97b3ae1 License Management 2015-01-23 18:32:21 +05:30
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
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