Commit Graph

7366 Commits

Author SHA1 Message Date
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
Prabath Abeysekara
8a25f55ac2 Merge pull request #9 from manojgunayadev/master
Licence Management Refactor
2015-01-27 23:45:32 +05:30
manoj
e80725b517 Merge remote-tracking branch 'upstream/master' 2015-01-27 23:46:56 +05:30
manoj
66efd5d301 License Management Refactor 2015-01-27 23:45:45 +05:30
Prabath Abeysekara
22f1f5d9b4 Merge pull request #8 from manojgunayadev/master
Licence Management Refactor
2015-01-27 23:34:21 +05:30
manoj
505b87a655 Merge remote-tracking branch 'upstream/master'
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
2015-01-27 23:20:49 +05:30
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