Commit Graph

145 Commits

Author SHA1 Message Date
Geeth Munasinghe
88060442bc Merge branch 'master' of https://github.com/wso2/product-cdm 2015-01-23 22:27:03 +05:30
Geeth Munasinghe
831cd121a9 fixing filter properties 2015-01-23 22:26:40 +05:30
manoj
a51057d07f features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/rxts/license.rxt 2015-01-23 20:58:52 +05:30
manoj
32137186ce features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
RXT file copy with server feature
2015-01-23 20:20:01 +05:30
manoj
0135051d84 License Management 2015-01-23 18:17:40 +05:30
Dulitha Wijewantha
b870490ea3 Merge branch 'master' of github.com:wso2/product-cdm 2015-01-22 21:23:08 +05:30
Dulitha Wijewantha
a3dc5d07e5 * Commented cdm app copying
* Implemented the getDevice()
* Added documentation
* Added a method to deviceDAO to get the device by a DeviceIdentifier
2015-01-22 21:14:35 +05:30
harshanL
793786f020 Added a new operation to the operation manager 2015-01-22 21:14:19 +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
Dulitha Wijewantha
93a82676e3 * Created a utility js to hold the utility functions
* Created the UI APIs for mobile
* Fixed a bug and changed the implementation to work with the properties Map instead of the List
* Changed method signature and implementation to accept DeviceType for the conversion
* UI level changes and license headers
2015-01-21 17:08:12 +05:30
Dulitha Wijewantha
6eabb80e47 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-21 13:46:09 +05:30
harshanL
eb0fd6dc31 Added operation support for Android 2015-01-21 12:29:06 +05:30
asok
877ef213e1 Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
	product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java
	product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java
	product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java
	product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java
	product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java
	product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/applicationContext.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_cert.pem
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_private.key
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/discover-service.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/enrollment-service.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/log4j.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/policy-service.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml
	product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties
2015-01-21 10:51:53 +05:30
asok
ad303e4611 committing 2015-01-21 10:46:56 +05:30
Dulitha Wijewantha
9fc79868aa Added a tabbed layout for the device list UI 2015-01-20 18:48:07 +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
inosh-perera
1f489c8d62 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-20 13:49:38 +05:30
inosh-perera
2663ee014c xml element name changes of UI 2015-01-20 13:49:33 +05:30
inosh-perera
8de9a702d7 added authentication response handler, comment fixes 2015-01-20 13:48:20 +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
harshanL
5cb85e2069 Fixed merge conflicts 2015-01-20 11:47:22 +05:30
harshanL
193eca9e2d Added operation persistance logic & refactored the code 2015-01-20 11:44:31 +05:30
manoj
17457bf6d3 Refactor Agents module 2015-01-20 11:42:32 +05:30
manoj
dd9bfdb6a7 Refactor Operations 2015-01-20 07:46:13 +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
manoj
6703f590f3 Merge Changes 2015-01-19 21:37:08 +05:30
prabathabey
b331f708dd Adding default H2 database related file contents to be packed during the phase where the final distribution is created 2015-01-19 00:54:57 +05:30
prabathabey
9b57455bcc Renaming data source names 2015-01-19 00:43:22 +05:30
prabathabey
c6cdf85c11 Fixing start up issues caused by not having proper API management related database schemas available 2015-01-18 18:48:02 +05:30
prabathabey
a4b022edd4 Excluding unnecessary transtive dependencies getting downloaded 2015-01-18 17:58:37 +05:30
Asok
8157f26401 updating windows plugin 2015-01-18 12:10:35 +05:30
inosh-perera
40ee310f42 returning auto incremented id 2015-01-16 20:14:48 +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
Dulitha Wijewantha
c884cfae23 Code formatting 2015-01-14 16:32:12 +05:30
Dulitha Wijewantha
9012737b08 Created a basic cdm app with device view and device list view 2015-01-14 13:57:18 +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
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
Geeth Munasinghe
9004f2cd36 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-12 16:47:05 +05:30
Geeth Munasinghe
745f83b9ed Fixing pom issues 2015-01-12 16:46:38 +05:30
inosh-perera
08583243e8 plugin database script added 2015-01-12 16:42:36 +05:30
prabathabey
717fa6dea8 Restructuring plugin config hierarchy 2015-01-11 23:58:12 +05:30
prabathabey
d336980b27 Fixing versioning related issues and adding an ant task to distribution pom.xml to create IDP management related schemas during packaging the distribution up 2015-01-11 23:44:27 +05:30