From 3b57b9a9fb49717d979e9a6f886a9f181a926a44 Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Thu, 27 Sep 2018 11:25:16 +0530 Subject: [PATCH] Whitelabel devic types --- .../org.wso2.iot.operation_1.0.0.json | 2 +- .../WSO2IoT-Geo-ExecutionPlan.siddhiql | 2 +- .../WSO2IoT-GeoAlerts-ExecutionPlan.siddhiql | 2 +- .../type-view.hbs | 2 +- .../cdmf.unit.device.type.arduino.type-view/type-view.hbs | 4 ++-- .../type-view.hbs | 2 +- .../carbon/device/mgt/iot/agent/virtual/ui/AgentUI.form | 2 +- .../carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java | 2 +- .../src/main/webapp/WEB-INF/web.xml | 4 ++-- .../type-view.hbs | 2 +- .../wso2/carbon/mdm/services/android/utils/TestUtils.java | 2 +- .../device-view.hbs | 2 +- .../cdmf.unit.device.type.android.type-view/type-view.hbs | 4 ++-- .../wso2/carbon/mdm/services/android/utils/TestUtils.java | 2 +- .../device-view.hbs | 2 +- .../cdmf.unit.device.type.windows.type-view/type-view.hbs | 2 +- .../jaggeryapps/windows-web-agent/app/conf/app-conf.json | 6 +++--- .../jaggeryapps/windows-web-agent/app/conf/config.json | 4 ++-- .../invoke-agent.hbs | 4 ++-- .../mdm.page.enrollments.windows.license/license.hbs | 2 +- .../pages/mdm.page.enrollments.windows.login/login.hbs | 6 +++--- .../app/units/mdm.unit.ui.header.logo/logo.hbs | 6 +++--- .../src/main/resources/agent/startService.sh | 2 +- .../src/main/resources/agent/testAgent.sh | 2 +- .../src/main/resources/agent/start-device.bat | 2 +- .../src/main/resources/agent/start-device.sh | 2 +- .../email/templates/android-enrollment-invitation.vm | 8 ++++---- 27 files changed, 41 insertions(+), 41 deletions(-) diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/org.wso2.iot.operation_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/org.wso2.iot.operation_1.0.0.json index c5786c0daa..08e4ee11a7 100755 --- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/org.wso2.iot.operation_1.0.0.json +++ b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/org.wso2.iot.operation_1.0.0.json @@ -2,7 +2,7 @@ "name": "org.wso2.iot.operation", "version": "1.0.0", "nickName": "Operation Stream", - "description": "Operation stream for WSO2 IoT Devices", + "description": "Operation stream for Entgra IoT Devices", "metaData": [ { "name": "deviceIdentifiers", diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-Geo-ExecutionPlan_1.0.0/WSO2IoT-Geo-ExecutionPlan.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-Geo-ExecutionPlan_1.0.0/WSO2IoT-Geo-ExecutionPlan.siddhiql index e8418fe499..d959d72a0b 100644 --- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-Geo-ExecutionPlan_1.0.0/WSO2IoT-Geo-ExecutionPlan.siddhiql +++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-Geo-ExecutionPlan_1.0.0/WSO2IoT-Geo-ExecutionPlan.siddhiql @@ -2,7 +2,7 @@ @Plan:name('WSO2IoT-Geo-ExecutionPlan') /* Enter a unique description for ExecutionPlan */ -@Plan:description('To convert the WSO2 IoT event incoming stream to relavant streams') +@Plan:description('To convert the Entgra IoT event incoming stream to relavant streams') /* define streams/tables and write queries here ... */ diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-GeoAlerts-ExecutionPlan_1.0.0/WSO2IoT-GeoAlerts-ExecutionPlan.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-GeoAlerts-ExecutionPlan_1.0.0/WSO2IoT-GeoAlerts-ExecutionPlan.siddhiql index 7274dc4c58..1b27bf2ef4 100644 --- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-GeoAlerts-ExecutionPlan_1.0.0/WSO2IoT-GeoAlerts-ExecutionPlan.siddhiql +++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/WSO2IoT-GeoAlerts-ExecutionPlan_1.0.0/WSO2IoT-GeoAlerts-ExecutionPlan.siddhiql @@ -2,7 +2,7 @@ @Plan:name('WSO2IoT-GeoAlerts-ExecutionPlan') /* Enter a unique description for ExecutionPlan */ -@Plan:description('To convert the WSO2 IoT event incoming stream to relavant streams') +@Plan:description('To convert the Entgra IoT event incoming stream to relavant streams') /* define streams/tables and write queries here ... */ diff --git a/components/device-types/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.hbs b/components/device-types/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.hbs index 006aa06355..bdec9e35a7 100644 --- a/components/device-types/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.hbs +++ b/components/device-types/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.hbs @@ -35,7 +35,7 @@

What it Does

-

Connect an Android device to WSO2 IoT Server and visualize sensor +

Connect an Android device to Entgra IoT Server and visualize sensor data.


Enroll Device diff --git a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs index 4231e2ae98..dde9d8fe67 100644 --- a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs +++ b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs @@ -31,7 +31,7 @@

What it Does

-

Connect the Arduino UNO board to WSO2 IoT Server and visualize sensor data.

+

Connect the Arduino UNO board to Entgra IoT Server and visualize sensor data.


What You Need

@@ -239,7 +239,7 @@ - The Arduino will publish its internal temperature to WSO2 IoT Server. + The Arduino will publish its internal temperature to Entgra IoT Server.

diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs index bbc17b0d00..c75eabc978 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs @@ -28,7 +28,7 @@

What it Does

-

Connect a RaspberryPi to WSO2 IoT Server and manage it.

+

Connect a RaspberryPi to Entgra IoT Server and manage it.


What You Need

diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.form b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.form index 43bc3e62ec..5995e8e260 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.form +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.form @@ -79,7 +79,7 @@ - + diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java index e3b4e89f66..841927e643 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/ui/AgentUI.java @@ -80,7 +80,7 @@ public class AgentUI extends javax.swing.JFrame { lblAgentName.setFont(new java.awt.Font("Cantarell", 1, 24)); // NOI18N lblAgentName.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); - lblAgentName.setText("Device Name: WSO2 IoT Virtual Agent"); + lblAgentName.setText("Device Name: Entgra IoT Virtual Agent"); jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); jLabel2.setText("Copyright (c) 2015, WSO2 Inc."); diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml index ff13bc4944..507b4353f7 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" metadata-complete="true"> - WSO2 IoT Server - WSO2 IoT Server + Entgra IoT Server + Entgra IoT Server CXFServlet diff --git a/components/device-types/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.type-view/type-view.hbs b/components/device-types/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.type-view/type-view.hbs index 1ee5cd631b..24e8233c94 100644 --- a/components/device-types/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.type-view/type-view.hbs +++ b/components/device-types/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.type-view/type-view.hbs @@ -26,7 +26,7 @@

What it Does

A Virtual Device that mimics the functionality of a real Firealarm. - Once run, the Virtual Firealarm connects to WSO2 IoT Server and pushes the Temperature readings.

+ Once run, the Virtual Firealarm connects to Entgra IoT Server and pushes the Temperature readings.

The device supports MQTT and XMPP Communications. It is configured to use MQTT by default.


diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java index cff3d8ca21..994cb94239 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java @@ -403,7 +403,7 @@ public class TestUtils { public static List getApplications() { List applications = new ArrayList<>(); Application app = new Application(); - app.setName("WSO2 IoT Agent"); + app.setName("Entgra IoT Agent"); app.setApplicationIdentifier("org.wos2.iot.agent"); app.setVersion("1.0.0"); app.setPlatform("Android"); diff --git a/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.device-view/device-view.hbs b/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.device-view/device-view.hbs index a1f1a38629..ed84b7cb9f 100644 --- a/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.device-view/device-view.hbs +++ b/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.device-view/device-view.hbs @@ -113,7 +113,7 @@ The device location information is not available right now! Please refresh the page in a few minutes. The location details will not be available if the device’s “Location Services setting” is disabled - or if WSO2 IoT Server has not received the device’s location information from the device. + or if Entgra IoT Server has not received the device’s location information from the device.

diff --git a/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.hbs b/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.hbs index 76afef5d72..3ec699ddb7 100644 --- a/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.hbs +++ b/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.hbs @@ -58,7 +58,7 @@ {{else}} href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device" {{/if}} - target="_blank">WSO2 Device Cloud documentation. + target="_blank">Entgra Device Cloud documentation.

{{else}}

Need help? Read WSO2 IoT Server documentation.

+ target="_blank">Entgra IoT Server documentation.

{{/if}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java index cff3d8ca21..994cb94239 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/utils/TestUtils.java @@ -403,7 +403,7 @@ public class TestUtils { public static List getApplications() { List applications = new ArrayList<>(); Application app = new Application(); - app.setName("WSO2 IoT Agent"); + app.setName("Entgra IoT Agent"); app.setApplicationIdentifier("org.wos2.iot.agent"); app.setVersion("1.0.0"); app.setPlatform("Android"); diff --git a/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.device-view/device-view.hbs b/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.device-view/device-view.hbs index c292e3e7db..6836e124f1 100644 --- a/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.device-view/device-view.hbs +++ b/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.device-view/device-view.hbs @@ -93,7 +93,7 @@ The device location information is not available right now! Please refresh the page in a few minutes. The location details will not be available if the device’s “Location Services setting” is disabled - or if WSO2 IoT Server has not received the device’s location information from the device. + or if Entgra IoT Server has not received the device’s location information from the device.

diff --git a/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.hbs b/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.hbs index 3a40f0f8c2..58818e613b 100644 --- a/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.hbs +++ b/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.hbs @@ -15,7 +15,7 @@

What it Does

-

Connect and manage your Windows device with WSO2 IoT Server.

+

Connect and manage your Windows device with Entgra IoT Server.


Enroll Device diff --git 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 index 2d6fe00be9..845f828f70 100755 --- 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 IoT Server", + "appName": "Entgra IoT Server", "cachingEnabled": true, "debuggingEnabled": false, "permissionRoot": "/", @@ -38,8 +38,8 @@ }, "generalConfig" : { "host" : "https://localhost:9443", - "companyName" : "WSO2 IoT Server", - "browserTitle" : "WSO2 IoT Server", + "companyName" : "Entgra IoT Server", + "browserTitle" : "Entgra IoT Server", "copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightOwner" : "WSO2 Inc.", "copyrightOwnersSite" : "http://www.wso2.org", diff --git 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 index 6575367e56..36ae4f0c02 100755 --- 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 @@ -20,8 +20,8 @@ "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication", "generalConfig" : { "host" : "%http.ip%", - "companyName" : "WSO2 IoT Server", - "browserTitle" : "WSO2 IoT Server", + "companyName" : "Entgra IoT Server", + "browserTitle" : "Entgra IoT Server", "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved." }, "isOAuthEnabled" : true, diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs index 7a958ed83f..0a64eae054 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.invoke-agent/invoke-agent.hbs @@ -32,7 +32,7 @@ under the License. --}} {{ unit "mdm.unit.wizard-stepper" steps = "Start Workplace, - Login to WSO2 IoT Server, + Login to Entgra IoT Server, Accept End User License Agreement" currentStep = "Start Workplace" currentStepIndex = 0 @@ -40,7 +40,7 @@ under the License. --}} Start the Workplace app to continue device enrollment.

- Setting up a Workplace account with WSO2 IoT Server + Setting up a Workplace account with Entgra IoT Server will offer you company policies, certificates and apps that help you connect to your business.
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs index 6d0c5147e4..ed5ea91b19 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.license/license.hbs @@ -32,7 +32,7 @@ under the License. --}} {{ unit "mdm.unit.wizard-stepper" steps = "Start Workplace, - Login to WSO2 IoT Server, + Login to Entgra IoT Server, Accept End User License Agreement" currentStep = "Accept End User License Agreement" currentStepIndex = 2 diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs index 90848f7477..c7c7d54526 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/pages/mdm.page.enrollments.windows.login/login.hbs @@ -25,7 +25,7 @@ under the License. --}} }} {{/zone}} {{!-- Inputting content into defined zones in enrollment layout --}} -{{unit "mdm.unit.ui.title" pageTitle="Windows Phone Enrollment | Login to WSO2 IoT Server"}} +{{unit "mdm.unit.ui.title" pageTitle="Windows Phone Enrollment | Login to Entgra IoT Server"}} {{#zone "headerTitle"}} Windows Phone Enrollment {{/zone}} @@ -33,9 +33,9 @@ under the License. --}} {{ unit "mdm.unit.wizard-stepper" steps = "Start Workplace, - Login to WSO2 IoT Server, + Login to Entgra IoT Server, Accept End User License Agreement" - currentStep = "Login to WSO2 IoT Server" + currentStep = "Login to Entgra IoT Server" currentStepIndex = 1 }} {{ diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.header.logo/logo.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.header.logo/logo.hbs index cabecd2d11..f4cd516a17 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.header.logo/logo.hbs +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.header.logo/logo.hbs @@ -17,8 +17,8 @@ }} {{#zone "brand"}} - -

WSO2 IoT

+ +

Entgra IoT

 {{/zone}} \ No newline at end of file diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh index c4a0dced19..36c6d91843 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/startService.sh @@ -21,7 +21,7 @@ #!/usr/bin/env bash echo "----------------------------------------------------------------" -echo "| WSO2 IOT Sample " +echo "| Entgra IOT Sample " echo "| RaspiAgent " echo "| ---------------- " echo "| ....initializing service-start-script " diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/testAgent.sh b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/testAgent.sh index 9a11ab485f..8f42cd4cfc 100644 --- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/testAgent.sh +++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/agent/testAgent.sh @@ -21,7 +21,7 @@ #!/bin/bash echo "----------------------------------------------------------------" -echo "| WSO2 IOT Sample " +echo "| Entgra IOT Sample " echo "| RaspiAgent " echo "| ---------------- " echo "| ....initializing startup-script " diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat index f19520f14a..ab0da6b902 100755 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.bat @@ -1,6 +1,6 @@ @echo off echo. -echo.WSO2 IOT Sample +echo.Entgra IOT Sample echo.Virtual Fire Alarm echo.initializing agent echo. diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh index 37853c9b1a..faece34f16 100755 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/agent/start-device.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "----------------------------------------------------------------" -echo "| WSO2 IOT Sample " +echo "| Entgra IOT Sample " echo "| Virtual RaspiAlarm " echo "| ---------------- " echo "| ....initializing startup-script " diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/email/templates/android-enrollment-invitation.vm b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/email/templates/android-enrollment-invitation.vm index 0a7195e28b..7b4e280e89 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/email/templates/android-enrollment-invitation.vm +++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/email/templates/android-enrollment-invitation.vm @@ -16,12 +16,12 @@ under the License. *# - You have been invited to enroll your Android device in WSO2 IoT + You have been invited to enroll your Android device in Entgra IoT - WSO2 IoT Server + Entgra IoT Server
@@ -38,7 +38,7 @@

- You have been invited by $first-name to enrol your android device in WSO2 IoT Server. + You have been invited by $first-name to enrol your android device in Entgra IoT Server. Click here to download device agent in to your Android device.

@@ -51,7 +51,7 @@

- WSO2 IoT Administrator + Entgra IoT Administrator