Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl

components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.realtime.analytics-view/analytics-view.js

@@ -18,7 +18,7 @@
 
 function onRequest(context) {
     var device = context.unit.params.device;
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
     var websocketEndpoint = devicemgtProps["httpsURL"].replace("https", "wss");
     var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);

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

@@ -18,7 +18,7 @@
 
 function onRequest(context){
     var viewModel = {};
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     viewModel.hostName = devicemgtProps["httpsWebURL"];
     return viewModel;
 }

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

@@ -17,7 +17,7 @@
  */
 
 function onRequest(context) {
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     
     var devices = context.unit.params.devices;
     var deviceType = context.uriParams.deviceType;

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

@@ -19,7 +19,7 @@
 function onRequest(context) {
     var log = new Log("stats.js");
     var device = context.unit.params.device;
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
     var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/iot.page.register/register.js

@@ -23,7 +23,7 @@
  * @returns {*} A context object that returns the dynamic state of this page to be presented
  */
 function onRequest(context) {
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     var page = {};
     page["usernameJSRegEx"] = devicemgtProps.userValidationConfig.usernameJSRegEx;
     page["usernameHelpText"] = devicemgtProps.userValidationConfig.usernameHelpMsg;

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

@@ -17,7 +17,7 @@
  */
 
 function onRequest(context) {
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
 
     var devices = context.unit.params.devices;
     var deviceType = context.uriParams.deviceType;

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

@@ -19,7 +19,7 @@
 function onRequest(context) {
     var log = new Log("stats.js");
     var device = context.unit.params.device;
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
     var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);

components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.analytics-view/analytics-view.js

@@ -17,7 +17,7 @@
  */
 
 function onRequest(context) {
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
 
     var devices = context.unit.params.devices;
     var deviceType = context.uriParams.deviceType;

components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js

@@ -19,7 +19,7 @@
 function onRequest(context) {
     var log = new Log("stats.js");
     var device = context.unit.params.device;
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
     var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/wrapper/AndroidDevice.java

@@ -53,7 +53,6 @@ public class AndroidDevice implements Serializable {
     )
     @NotNull
     @Size(min = 2, max = 45)
-    @Pattern(regexp = "^[A-Za-z0-9]*$")
     private String deviceIdentifier;
     @ApiModelProperty(
             name = "enrolmentInfo",

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.type-view/type-view.js

@@ -18,7 +18,7 @@
 
 function onRequest(context){
     var viewModel = {};
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     viewModel.hostName = devicemgtProps["httpsURL"];
     return viewModel;
 }

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -61,11 +61,16 @@
         "copyrightSuffix" : " All Rights Reserved."
     },
     "scopes" : [
-    "license-add", "license-view", "device-view", "device-info", "device-list", "device-view-own",
+        "license-add", "license-view", "device-view",
-    "device-modify", "device-search", "operation-install", "operation-view", "operation-modify", "operation-uninstall",
+        "device-info", "device-list", "device-view-own", "device-modify", "device-search",
-    "group-add", "group-share", "group-modify", "group-view", "group-remove", "certificate-modify", "certificate-view",
+        "operation-install", "operation-view", "operation-modify", "operation-uninstall",
-    "configuration-view", "configuration-modify", "policy-view", "policy-modify", "device-notification-view",
+        "group-add", "group-share", "group-modify", "group-view", "group-remove",
-    "device-notification-modify", "feature-view", "roles-view", "roles-modify", "roles-remove", "roles-add",
+        "certificate-modify", "certificate-view",
+        "configuration-view", "configuration-modify",
+        "policy-view", "policy-modify",
+        "device-notification-view", "device-notification-modify",
+        "feature-view",
+        "roles-view", "roles-modify", "roles-remove", "roles-add",
         "user-password-reset", "user-password-modify", "user-modify", "user-view", "user-invite", "user-remove", "user-add"
     ],
     "isOAuthEnabled" : true,

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.type-view/type-view.js

@@ -18,7 +18,7 @@
 
 function onRequest(context){
     var viewModel = {};
-    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
+    var devicemgtProps = require("/app/conf/reader/main.js")["conf"];
     viewModel.hostName = devicemgtProps["httpsURL"];
     return viewModel;
 }