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.agent/app/build.gradle

@@ -61,5 +61,4 @@ dependencies {
     compile 'org.altbeacon:android-beacon-library:2.8.1'
     compile 'uk.co.alt236:easycursor-android:1.0.0'
     compile 'uk.co.alt236:bluetooth-le-library-android:1.0.0'
-
 }

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

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

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml

@@ -81,21 +81,21 @@
     <Permission>
         <name>Enroll</name>
         <path>/device-mgt/user/device/android/enroll</path>
-        <url>/device/*/applications</url>
+        <url>/devices/*/applications</url>
         <method>PUT</method>
     </Permission>
 
     <Permission>
         <name>Enroll</name>
         <path>/device-mgt/user/device/android/enroll</path>
-        <url>/device/*/pending-operations</url>
+        <url>/devices/*/pending-operations</url>
         <method>PUT</method>
     </Permission>
 
     <Permission>
         <name>Enroll</name>
         <path>/device-mgt/user/device/android/enroll</path>
-        <url>/device/*/status</url>
+        <url>/devices/*/status</url>
         <method>GET</method>
     </Permission>
 

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

@@ -0,0 +1,42 @@
+{
+    "appName": "Enterprise Mobility Manager",
+    "cachingEnabled": true,
+    "debuggingEnabled": false,
+    "permissionRoot": "/",
+    "loginPage": "cdmf.page.sign-in",
+    "adminServicesUrl": "https://${server.ip}:${server.https_port}/admin/services/",
+    "authModule": {
+        "enabled": true,
+        "login": {
+            "onSuccess": {
+                "script": "/app/modules/login.js",
+                "page": "cdmf.page.dashboard"
+            },
+            "onFail": {
+                "script": "/app/modules/login.js",
+                "page": "cdmf.page.sign-in"
+            }
+        },
+        "logout": {
+            "onSuccess": {
+                "page": "cdmf.page.sign-in"
+            },
+            "onFail": {
+                "page": "cdmf.page.dashboard"
+            }
+        },
+        "sso": {
+            "enabled": false,
+            "issuer" : "emm",
+            "appName" : "emm",
+            "identityProviderUrl" : "https://localhost:9443/samlsso",
+            "acs": "https://localhost:9443/devicemgt/uuf/sso/acs",
+            "identityAlias": "wso2carbon",
+            "responseSigningEnabled" : "true",
+            "useTenantKey": false
+        }
+    },
+    "errorPages": {
+        "default": "uuf.page.error"
+    }
+}