Merge branch 'master' into 'master'

Add capability to store device type specific platform configurations for any device type

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

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

@@ -21,6 +21,7 @@ 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.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
@@ -289,7 +290,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
     }
 
     @Override
-    public FeatureManager getFeatureManager(String s) throws DeviceManagementException {
+    public FeatureManager getFeatureManager(String s) throws DeviceTypeNotFoundException {
         return null;
     }
 

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.platform.configuration/configuration.hbs

@@ -17,6 +17,11 @@
 }}
 <!-- android -->
 <div class="panel panel-default">
+    <div class="panel-heading" role="tab">
+        <h2 class="sub-title panel-title">
+            Platform Configuration - Windows
+        </h2>
+    </div>
     <div id="android-config-body" class="panel-collapse panel-body" role="tabpanel">
         <div id="android-config-error-msg" class="alert alert-danger hidden" role="alert">
             <i class="icon fw fw-error"></i><span></span>

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.platform.configuration/public/js/platform-configuration.js

@@ -92,7 +92,7 @@ var kioskConfigs = {
 $(document).ready(function () {
     $("#fcm-inputs").hide();
     tinymce.init({
-        selector: "textarea",
+        selector: "#android-eula",
         height:500,
         theme: "modern",
         plugins: [

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

@@ -21,6 +21,7 @@ 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.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
@@ -289,7 +290,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
     }
 
     @Override
-    public FeatureManager getFeatureManager(String s) throws DeviceManagementException {
+    public FeatureManager getFeatureManager(String s) throws DeviceTypeNotFoundException {
         return null;
     }
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.platform.configuration/configuration.hbs

@@ -17,6 +17,11 @@
 }}
 <!-- windows -->
 <div class="panel panel-default">
+    <div class="panel-heading" role="tab">
+        <h2 class="sub-title panel-title">
+            Platform Configuration - Windows
+        </h2>
+    </div>
     <div id="windows-config-body" class="panel-collapse panel-body" role="tabpanel">
         <div id="windows-config-error-msg" class="alert alert-danger hidden" role="alert">
             <i class="icon fw fw-error"></i><span></span>

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

@@ -72,7 +72,7 @@ function promptErrorPolicyPlatform(errorMsg) {
 
 $(document).ready(function () {
     tinymce.init({
-        selector: "textarea",
+        selector: "#windows-eula",
         height:500,
         theme: "modern",
         plugins: [

pom.xml

@@ -1230,7 +1230,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.2.4</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.2.5-SNAPSHOT</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.1.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->