Merge branch 'application-mgt-new' into 'application-mgt-new'

Sync with upstream master

See merge request entgra/carbon-device-mgt-plugins!90

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java

@@ -38,6 +38,7 @@ import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.exceptions.UnauthorizedDeviceAccessException;
+import org.wso2.carbon.device.mgt.common.device.details.DeviceData;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
@@ -159,6 +160,10 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override public Device getDevice(DeviceData deviceData, boolean b) throws DeviceManagementException {
+        return null;
+    }
+
     @Override
     public List<Device> getDevicesBasedOnProperties(Map map) throws DeviceManagementException {
         return null;
@@ -669,6 +674,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
         return null;
     }
 
+    @Override public PaginationResult getAppSubscribedDevices(int i, int i1, List<Integer> list, String s)
+            throws DeviceManagementException {
+        return null;
+    }
+
     @Override
     public boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException, InvalidDeviceException {return false;}
 }

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js

@@ -21,6 +21,7 @@ function onRequest(context) {
     var deviceType = context["uriParams"]["deviceType"];
     var deviceId = request.getParameter("id");
     var owner = request.getParameter("owner");
+    var ownership = request.getParameter("ownership");
     var deviceViewData = {};
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var carbonServer = require("carbon").server;
@@ -28,7 +29,7 @@ function onRequest(context) {
 
     if (deviceType && deviceId) {
         var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
-        var response = deviceModule.viewDevice(deviceType, deviceId, owner);
+        var response = deviceModule.viewDevice(deviceType, deviceId, owner, ownership);
         if (response["status"] === "success") {
             deviceViewData["deviceFound"] = true;
             deviceViewData["isAuthorized"] = true;

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js

@@ -211,7 +211,7 @@ var InitiateViewOption = null;
             order: [],
             ajax: {
                 url: "/devicemgt/api/operation/paginate",
-                data: {deviceId: deviceIdentifier, deviceType: deviceType, owner: owner},
+                data: {deviceId: deviceIdentifier, deviceType: deviceType, owner: owner, ownership: ownership},
                 dataSrc: function (json) {
                     $("#operations-spinner").addClass("hidden");
                     $("#operations-log-container").empty();

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ /*
-  ~ *  Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~ *
-  ~ *  WSO2 Inc. licenses this file to you under the Apache License,
-  ~ *  Version 2.0 (the "License"); you may not use this file except
-  ~ *  in compliance with the License.
-  ~ *  You may obtain a copy of the License at
-  ~ *
-  ~ *    http://www.apache.org/licenses/LICENSE-2.0
-  ~ *
-  ~ * Unless required by applicable law or agreed to in writing,
-  ~ * software distributed under the License is distributed on an
-  ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ * KIND, either express or implied.  See the License for the
-  ~ * specific language governing permissions and limitations
-  ~ * under the License.
-  ~ */
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-         http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
-    <jaxrs:server id="services" address="/">
-        <jaxrs:serviceBeans>
-            <ref bean="deviceManagementService"/>
-            <ref bean="deviceManagementAdminService"/>
-            <ref bean="eventReceiverService"/>
-            <ref bean="androidEnterprise"/>
-            <ref bean="deviceTypeConfigurationService"/>
-            <ref bean="swaggerResource"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <ref bean="jsonProvider"/>
-            <ref bean="errorHandler"/>
-            <ref bean="swaggerWriter"/>
-            <ref bean="GlobalExceptionMapper"/>
-        </jaxrs:providers>
-        <jaxrs:properties>
-            <!-- This is added to catch interceptor level exceptions in GlobalThrowableMapper. -->
-            <entry key="map.cxf.interceptor.fault" value="true" />
-        </jaxrs:properties>
-    </jaxrs:server>
-
-    <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
-    <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
-    <bean id="GlobalExceptionMapper" class="org.wso2.carbon.mdm.services.android.exception.GlobalThrowableMapper"/>
-    <bean id="ValidationInterceptor" class="org.wso2.carbon.mdm.services.android.common.ValidationInterceptor"/>
-
-    <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
-        <property name="resourcePackage" value="org.wso2.carbon.mdm.services.android.services"/>
-        <property name="version" value="0.9"/>
-        <property name="host" value="localhost:9443"/>
-        <property name="schemes" value="https" />
-        <property name="basePath" value="/api/device-mgt/android/v0.9"/>
-        <property name="title" value="Android Device Management API Definitions"/>
-        <property name="contact" value="dev@wso2.org"/>
-        <property name="license" value="Apache 2.0"/>
-        <property name="licenseUrl" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
-        <property name="scan" value="true"/>
-    </bean>
-
-    <bean id="deviceManagementService" class="org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementServiceImpl"/>
-    <bean id="deviceManagementAdminService" class="org.wso2.carbon.mdm.services.android.services.impl.DeviceManagementAdminServiceImpl"/>
-    <bean id="eventReceiverService" class="org.wso2.carbon.mdm.services.android.services.impl.EventReceiverServiceImpl"/>
-    <bean id="deviceTypeConfigurationService" class="org.wso2.carbon.mdm.services.android.services.impl.DeviceTypeConfigurationServiceImpl"/>
-    <bean id="androidEnterprise" class="org.wso2.carbon.mdm.services.android.services.impl.AndroidEnterpriseServiceImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.mdm.services.android.common.GsonMessageBodyHandler"/>
-    <bean id="errorHandler" class="org.wso2.carbon.mdm.services.android.common.ErrorHandler"/>
-    <cxf:bus>
-        <cxf:inInterceptors>
-            <ref bean="ValidationInterceptor"/>
-        </cxf:inInterceptors>
-    </cxf:bus>
-</beans>
-

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceInformationManagerServiceMock.java

@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
- *
- * Entgra (pvt) Ltd. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.mdm.services.android.mocks;
-
-import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
-import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
-import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
-
-import java.util.List;
-
-public class DeviceInformationManagerServiceMock implements DeviceInformationManager {
-    @Override
-    public void addDeviceInfo(DeviceIdentifier deviceIdentifier, DeviceInfo deviceInfo)
-            throws DeviceDetailsMgtException {
-
-    }
-
-    @Override
-    public DeviceInfo getDeviceInfo(DeviceIdentifier deviceIdentifier) throws DeviceDetailsMgtException {
-        return null;
-    }
-
-    @Override
-    public List<DeviceInfo> getDevicesInfo(List<DeviceIdentifier> list) throws DeviceDetailsMgtException {
-        return null;
-    }
-
-    @Override
-    public void addDeviceLocation(DeviceLocation deviceLocation) throws DeviceDetailsMgtException {
-
-    }
-
-    @Override
-    public DeviceLocation getDeviceLocation(DeviceIdentifier deviceIdentifier) throws DeviceDetailsMgtException {
-        return null;
-    }
-
-    @Override
-    public List<DeviceLocation> getDeviceLocations(List<DeviceIdentifier> list) throws DeviceDetailsMgtException {
-        return null;
-    }
-
-    @Override
-    public void addDeviceLocationHistory(Device device, DeviceLocation deviceLocation) throws DeviceDetailsMgtException {
-
-    }
-}

pom.xml

@@ -1239,7 +1239,7 @@
         <carbon.devicemgt.plugins.version>4.2.9-SNAPSHOT</carbon.devicemgt.plugins.version>
 
         <!-- Android Agent Artifact Version-->
-        <android.agent.version>3.6.3</android.agent.version>
+        <android.agent.version>3.7.0</android.agent.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.6.21</carbon.commons.version>