Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x

8 years ago · c650b4c818
parent cb9783a67f 05e2cb7bb8
commit c650b4c818
4 changed files with 10 additions and 10 deletions
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/app-conf.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/app-conf.json
@ -1,5 +1,5 @@
 {
-    "appName": "WSO2 Enterprise Mobility Manager",
+    "appName": "WSO2 IoT Server",
    "cachingEnabled": true,
    "debuggingEnabled": false,
    "permissionRoot": "/",
@ -38,8 +38,8 @@
    },
    "generalConfig" : {
        "host" : "https://localhost:9443",
-        "companyName" : "WSO2 Enterprise Mobility Manager",
-        "browserTitle" : "WSO2 EMM",
+        "companyName" : "WSO2 IoT Server",
+        "browserTitle" : "WSO2 IoT Server",
        "copyrightPrefix" : "\u00A9 %date-year%, ",
        "copyrightOwner" : "WSO2 Inc.",
        "copyrightOwnersSite" : "http://www.wso2.org",
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
@ -38,8 +38,8 @@
    "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/services/federated/bst/authentication",
    "generalConfig" : {
        "host" : "%http.ip%",
-        "companyName" : "WSO2 Enterprise Mobility Manager",
-        "browserTitle" : "WSO2 EMM",
+        "companyName" : "WSO2 IoT Server",
+        "browserTitle" : "WSO2 IoT Server",
        "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."
    },
    "isOAuthEnabled" : true,
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json
@ -1,5 +1,5 @@
 {
-    "appName": "WSO2 Enterprise Mobility Manager",
+    "appName": "WSO2 IoT Server",
    "cachingEnabled": true,
    "debuggingEnabled": false,
    "permissionRoot": "/",
@ -38,8 +38,8 @@
    },
    "generalConfig" : {
        "host" : "https://localhost:9443",
-        "companyName" : "WSO2 Enterprise Mobility Manager",
-        "browserTitle" : "WSO2 EMM",
+        "companyName" : "WSO2 IoT Server",
+        "browserTitle" : "WSO2 IoT Server",
        "copyrightPrefix" : "\u00A9 %date-year%, ",
        "copyrightOwner" : "WSO2 Inc.",
        "copyrightOwnersSite" : "http://www.wso2.org",
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
@ -38,8 +38,8 @@
    "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication",
    "generalConfig" : {
        "host" : "%http.ip%",
-        "companyName" : "WSO2 Enterprise Mobility Manager",
-        "browserTitle" : "WSO2 EMM",
+        "companyName" : "WSO2 IoT Server",
+        "browserTitle" : "WSO2 IoT Server",
        "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."
    },
    "isOAuthEnabled" : true,