From c93410eb9214eb9100cc46b493cd1674c6069221 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Mon, 12 Jun 2017 11:35:33 +0530 Subject: [PATCH] added few changes after review --- .../template/HTTPDeviceTypeManagerService.java | 15 ++++++++------- .../operation-bar.hbs | 2 +- .../pom.xml | 3 --- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java index c05da78f3c..56dc171db7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java @@ -99,13 +99,14 @@ public class HTTPDeviceTypeManagerService extends DeviceTypeManagerService imple } deviceTypeConfiguration.setName(deviceTypeName); - if (deviceTypeMetaDefinition.getLicense() != null) { - License license = new License(); - license.setLanguage(deviceTypeMetaDefinition.getLicense().getLanguage()); - license.setText(deviceTypeMetaDefinition.getLicense().getText()); - license.setVersion(deviceTypeMetaDefinition.getLicense().getVersion()); - deviceTypeConfiguration.setLicense(license); - } + //TODO: Add it to the license management service. +// if (deviceTypeMetaDefinition.getLicense() != null) { +// License license = new License(); +// license.setLanguage(deviceTypeMetaDefinition.getLicense().getLanguage()); +// license.setText(deviceTypeMetaDefinition.getLicense().getText()); +// license.setVersion(deviceTypeMetaDefinition.getLicense().getVersion()); +// deviceTypeConfiguration.setLicense(license); +// } PolicyMonitoring policyMonitoring = new PolicyMonitoring(); policyMonitoring.setEnabled(deviceTypeMetaDefinition.isPolicyMonitoringEnabled()); deviceTypeConfiguration.setPolicyMonitoring(policyMonitoring); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs index 04030eb5e8..0dd0c6a174 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs @@ -59,7 +59,7 @@
- diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml index b686fbc64f..86715239b9 100644 --- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml +++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml @@ -80,9 +80,6 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions:${carbon.device.mgt.version} - - org.wso2.carbon.devicemgt:org.wso2.carbon.identity.authenticator.backend.oauth:${carbon.device.mgt.version} - org.wso2.carbon.core.server:${carbon.kernel.version}