prabathabey
8db95a349d
Improving License handling functionality
2015-02-16 17:41:10 +05:30
Geeth Munasinghe
60e98f12b2
Adding the bundle activator for PIP
2015-02-13 19:46:08 +05:30
manoj
cd3913d43d
Remove Date Adaptor class
2015-02-13 19:43:47 +05:30
manoj
2086fb59eb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-02-13 15:02:17 +05:30
manoj
4d87e3f605
remove xml data adaptor
2015-02-13 15:01:42 +05:30
harshanL
db5b8b1e1e
Fixed build issue
2015-02-13 10:19:02 +05:30
Geeth Munasinghe
d13ffbb7c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-02-12 20:05:11 +05:30
Geeth Munasinghe
3032b1c55f
Adding policy components, renamed the evaluator as the complex policy decision point, added the PIP component and simple policy decision point, Add the interfaces related to policies
2015-02-12 20:04:48 +05:30
harshanL
1736d5db3e
CDMF-8 fixes
2015-02-12 18:32:06 +05:30
harshanL
98ac04479d
CDMF-6 fix
2015-02-10 18:28:18 +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
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
fb3e40bc2f
Merge branch 'master' of https://github.com/wso2/product-cdm
2015-02-09 12:07:16 +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
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
manoj
815dc00344
Merge branch 'master' of https://github.com/wso2/product-cdm
2015-02-07 06:20:23 +05:30
manoj
4b81d04320
License Managment refactor
2015-02-07 06:14:20 +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
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
manoj
8cd5f6d61f
Default License ManagementY
2015-02-05 13:11:10 +05:30
manoj
394258d10f
Default License feature
2015-02-05 13:10:26 +05:30
manoj
b21676a639
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
...
Default License feature
2015-02-05 13:09:48 +05:30
Geeth Munasinghe
e1b94822ab
[maven-release-plugin] prepare for next development iteration
2015-02-05 12:35:56 +05:30
Geeth Munasinghe
7f0558448e
[maven-release-plugin] prepare release 1.0.0
2015-02-05 12:35:47 +05:30
prabathabey
d6a22b06ff
Fixing more SNAPSHOT versions, used in carbon-governance, carbon-deployment related components
2015-02-02 21:13:52 +05:30
harshanL
d84a3c47d2
Removed private package declaration in device common bundle & added doc comments
2015-02-02 08:04:13 +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
Geeth Munasinghe
f44b4597db
Fixing group ids of the pom files
2015-01-29 20:03:04 +05:30
manoj
66efd5d301
License Management Refactor
2015-01-27 23:45:45 +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
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
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
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
Dulitha Wijewantha
49a46ca909
Fixed indentation
2015-01-23 12:46:35 +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
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
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
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
harshanL
eb0fd6dc31
Added operation support for Android
2015-01-21 12:29:06 +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
Geeth Munasinghe
77016e614c
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2015-01-20 12:02:21 +05:30
harshanL
193eca9e2d
Added operation persistance logic & refactored the code
2015-01-20 11:44:31 +05:30
Geeth Munasinghe
9f789af79f
Fixing git repo issues
2015-01-20 11:41:44 +05:30
Geeth Munasinghe
ce3149bc45
Adding partially completed policy evaluation
2015-01-20 11:10:47 +05:30
manoj
da0351ebcd
Change device type to device type Id
2015-01-20 07:37:39 +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
