manoj
428554cfe8
Unit test change to prepared statement
2015-01-27 21:51:28 +05:30
manoj
f907684a0b
license constants Refactor
2015-01-27 21:38:08 +05:30
manoj
2eadf11eaf
Refactor license constants
2015-01-27 21:37:23 +05:30
manoj
79261210f2
Refactor license constants
2015-01-27 21:35:14 +05:30
manoj
62f858d606
License Management Refactor
2015-01-27 21:28:04 +05:30
prabathabey
d439691a01
Fixing formatting issues
2015-01-27 20:27:16 +05:30
manoj
6e262cb60b
set active status for enroll device
2015-01-27 20:22:38 +05:30
Prabath Abeysekara
a4ffdf1aa5
Merge pull request #7 from manojgunayadev/master
...
set active status for enroll device
2015-01-27 20:21:56 +05:30
manoj
60e539b583
set active status for enroll device
2015-01-27 20:20:42 +05:30
manoj
b56e42792a
set active status for enroll device
2015-01-27 20:18:15 +05:30
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
Geeth Munasinghe
4c690f32ab
Merge branch 'master' of https://github.com/dulichan/product-cdm
2015-01-23 22:13:48 +05:30
Geeth Munasinghe
641dcdd2d5
Merge branch 'master' of https://github.com/manojgunayadev/product-cdm
2015-01-23 22:08:49 +05:30
Dulitha Wijewantha
c8d510eea7
Merge branch 'master' of github.com:wso2/product-cdm
2015-01-23 22:03:24 +05:30
Dulitha Wijewantha
7f3516b2a6
* Added a description to the feature object
...
* Added the COMMAND enum to the Operation class
2015-01-23 21:52:00 +05:30
prabathabey
4fd229357a
Enabling logging for test case implementations
2015-01-23 21:24:02 +05:30
manoj
119dbdf405
Remove unnecessary folder
2015-01-23 21:15:45 +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
0f5da210a1
Move rxt file to server feature
2015-01-23 20:58:17 +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
Dulitha Wijewantha
9e68b5fdb8
Merge branch 'master' of github.com:wso2/product-cdm
2015-01-23 18:40:23 +05:30
manoj
10e97b3ae1
License Management
2015-01-23 18:32:21 +05:30
Geeth Munasinghe
1ce417f203
Merge branch 'manojgunayadev-master'
2015-01-23 18:32:09 +05:30
Geeth Munasinghe
7718a4cb84
Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master
2015-01-23 18:29:58 +05:30
Dulitha Wijewantha
277f0341b1
* Add device type to the feature
...
* Added method to operation manager to get features by type
* Added an exception for feature management
2015-01-23 18:29:28 +05:30
Geeth Munasinghe
5fed717491
Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master
2015-01-23 18:25:16 +05:30
manoj
0135051d84
License Management
2015-01-23 18:17:40 +05:30
Geeth Munasinghe
38e1892333
gMerge branch 'master' of https://github.com/wso2/product-cdm
2015-01-23 14:47:33 +05:30
Geeth Munasinghe
94905bdc77
Changing the read me file
2015-01-23 14:47:24 +05:30
Geeth Munasinghe
b3caf026a9
Merging changes of dulitha
...
Merge branch 'dulichan-master'
2015-01-23 13:43:16 +05:30
Dulitha Wijewantha
49a46ca909
Fixed indentation
2015-01-23 12:46:35 +05:30
Dulitha Wijewantha
2360d1ae8c
Merge branch 'master' of github.com:dulichan/product-cdm
2015-01-23 11:41:53 +05:30
Dulitha Wijewantha
6f2053995d
Changed the Map implementations to List since Map implementations are not very well supported by CXF
2015-01-23 11:40:36 +05:30
Dulitha Wijewantha
394d841d4b
Changed the Map implementations to List since Map implementations are not very well supported by CFX
2015-01-23 11:22:34 +05:30
manoj
87e272a823
Merge remote-tracking branch 'upstream/master'
2015-01-23 10:09:53 +05:30
manoj
f4e9f1f15b
License Management
2015-01-23 10:08:42 +05:30
manoj
0e96d82968
License Managemnt
2015-01-23 10:04:41 +05:30
Prabath Abeysekara
0ffa15f463
Merge pull request #2 from dulichan/master
...
Implements the getDevice method of DeviceManager
2015-01-23 06:01:43 +05:30
Dulitha Wijewantha
5e68735625
Removed the exception. It has to be handled in a different layer
2015-01-22 22:06:37 +05:30
Dulitha Wijewantha
315603481d
Fixed line spacing issues
2015-01-22 21:51: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
Geeth
25ab5f1fdc
Merge pull request #1 from dulichan/master
...
Improvements to the UI and various merges - By Dulitha
2015-01-22 17:30:07 +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
a195844042
Changed the properties implementation to a Map from List. Removed unnecessary utility methods. Changed the conversion util methods.
2015-01-21 16:55:37 +05:30
