Merge pull request #467 from madhawap/release-3.0.x

Adding separate tasks to carry out device monitoring for each device type

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java

@@ -22,8 +22,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
+import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.TaskOperation;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -54,7 +54,7 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
     }
 
     @Override
-    public List<TaskOperation> getTasksForPlatform() {
+    public OperationMonitoringTaskConfig getOperationMonitoringConfig() {
         return null;
     }
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java

@@ -20,14 +20,12 @@ package org.wso2.carbon.device.mgt.mobile.windows.impl;
 
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
+import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.TaskOperation;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
-import java.util.List;
-
 /**
  * This represents the Windows implementation of DeviceManagerService.
  */
@@ -43,7 +41,7 @@ public class WindowsDeviceManagementService implements DeviceManagementService {
     }
 
     @Override
-    public List<TaskOperation> getTasksForPlatform() {
+    public OperationMonitoringTaskConfig getOperationMonitoringConfig() {
         return null;
     }
 

features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml

@@ -315,6 +315,8 @@
         </Feature>
     </Features>
     <TaskConfiguration>
+        <Enable>true</Enable>
+        <Frequency>60000</Frequency>
         <Operations>
             <Operation>
                 <Name>DEVICE_INFO</Name>