community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build and test failures after upstream merge

Browse Source
This commit is contained in:
charitha 2017-10-06 18:51:50 +05:30
parent 5f0c2f18ce
commit b5b3647668
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
View File

@ -430,8 +430,9 @@ public final class DeviceManagerUtil {
public static boolean isPublishOperationResponseEnabled() throws DeviceManagementException { public static boolean isPublishOperationResponseEnabled() throws DeviceManagementException {
DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance(). DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance().
getDeviceManagementConfig(); getDeviceManagementConfig();
if (deviceManagementConfig != null && isOperationAnalyticsEnabled()) { if (deviceManagementConfig != null) {
return deviceManagementConfig.getOperationAnalyticsConfiguration().getPublishOperationResponse(); return isOperationAnalyticsEnabled()
&& deviceManagementConfig.getOperationAnalyticsConfiguration().getPublishOperationResponse();
} else { } else {
throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " + throw new DeviceManagementException("Device-Mgt configuration has not initialized. Please check the " +
"cdm-config.xml file."); "cdm-config.xml file.");

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java
View File

@ -59,8 +59,6 @@ public class TestDataHolder {
public static DeviceInfo generateDummyDeviceInfo() { public static DeviceInfo generateDummyDeviceInfo() {
DeviceInfo deviceInfo = new DeviceInfo(); DeviceInfo deviceInfo = new DeviceInfo();
deviceInfo.setIMEI("IMEI-12345");
deviceInfo.setIMSI("IMSI-12344");
deviceInfo.setDeviceModel("DUMMY_MODEL"); deviceInfo.setDeviceModel("DUMMY_MODEL");
deviceInfo.setVendor("WSO2"); deviceInfo.setVendor("WSO2");
deviceInfo.setOsVersion("OREO"); deviceInfo.setOsVersion("OREO");

4
features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>3.0.119-SNAPSHOT</version> <version>3.0.136-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.basics.feature</artifactId> <artifactId>org.wso2.carbon.device.mgt.basics.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>3.0.119-SNAPSHOT</version> <version>3.0.136-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Basics Feature</name> <name>WSO2 Carbon - Device Management Basics Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Basic Device Management functionality <description>This feature contains the core bundles required for Basic Device Management functionality