Merge branch 'master' into 'master'

Whitelabel device types

See merge request entgra/carbon-device-mgt-plugins!2
revert-dabc3590
Charitha Goonetilleke 6 years ago
commit 5996ddb5e1

@ -2,7 +2,7 @@
"name": "org.wso2.iot.operation", "name": "org.wso2.iot.operation",
"version": "1.0.0", "version": "1.0.0",
"nickName": "Operation Stream", "nickName": "Operation Stream",
"description": "Operation stream for WSO2 IoT Devices", "description": "Operation stream for Entgra IoT Devices",
"metaData": [ "metaData": [
{ {
"name": "deviceIdentifiers", "name": "deviceIdentifiers",

@ -2,7 +2,7 @@
@Plan:name('WSO2IoT-Geo-ExecutionPlan') @Plan:name('WSO2IoT-Geo-ExecutionPlan')
/* Enter a unique description for 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 ... */ /* define streams/tables and write queries here ... */

@ -2,7 +2,7 @@
@Plan:name('WSO2IoT-GeoAlerts-ExecutionPlan') @Plan:name('WSO2IoT-GeoAlerts-ExecutionPlan')
/* Enter a unique description for 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 ... */ /* define streams/tables and write queries here ... */

@ -35,7 +35,7 @@
<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top"> <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect an Android device to WSO2 IoT Server and visualize sensor <p class="grey margin-top">Connect an Android device to Entgra IoT Server and visualize sensor
data.</p> data.</p>
<br> <br>
<a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a> <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>

@ -31,7 +31,7 @@
<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top"> <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect the Arduino UNO board to WSO2 IoT Server and visualize sensor data.</p> <p class="grey margin-top">Connect the Arduino UNO board to Entgra IoT Server and visualize sensor data.</p>
<br> <br>
<h3 class="uppercase">What You Need</h3> <h3 class="uppercase">What You Need</h3>
<hr> <hr>
@ -239,7 +239,7 @@
<i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw fw-circle-outline fw-stack-2x"></i>
<i class="fw fw-right-arrow fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span> </span>
The Arduino will publish its internal temperature to WSO2 IoT Server. The Arduino will publish its internal temperature to Entgra IoT Server.
<br/><br/> <br/><br/>
<span class="fw-stack margin-right"> <span class="fw-stack margin-right">

@ -28,7 +28,7 @@
<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top"> <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect a RaspberryPi to WSO2 IoT Server and manage it.</p> <p class="grey margin-top">Connect a RaspberryPi to Entgra IoT Server and manage it.</p>
<br> <br>
<h3 class="uppercase">What You Need</h3> <h3 class="uppercase">What You Need</h3>
<hr> <hr>

@ -79,7 +79,7 @@
<Font name="Cantarell" size="24" style="1"/> <Font name="Cantarell" size="24" style="1"/>
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="2"/> <Property name="horizontalAlignment" type="int" value="2"/>
<Property name="text" type="java.lang.String" value="Device Name: WSO2 IoT Virtual Agent"/> <Property name="text" type="java.lang.String" value="Device Name: Entgra IoT Virtual Agent"/>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel2"> <Component class="javax.swing.JLabel" name="jLabel2">

@ -80,7 +80,7 @@ public class AgentUI extends javax.swing.JFrame {
lblAgentName.setFont(new java.awt.Font("Cantarell", 1, 24)); // NOI18N lblAgentName.setFont(new java.awt.Font("Cantarell", 1, 24)); // NOI18N
lblAgentName.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); 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.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel2.setText("Copyright (c) 2015, WSO2 Inc."); jLabel2.setText("Copyright (c) 2015, WSO2 Inc.");

@ -4,8 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
metadata-complete="true"> metadata-complete="true">
<display-name>WSO2 IoT Server</display-name> <display-name>Entgra IoT Server</display-name>
<description>WSO2 IoT Server</description> <description>Entgra IoT Server</description>
<servlet> <servlet>
<servlet-name>CXFServlet</servlet-name> <servlet-name>CXFServlet</servlet-name>

@ -26,7 +26,7 @@
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">A Virtual Device that mimics the functionality of a real Firealarm. <p class="grey margin-top">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.</p> Once run, the Virtual Firealarm connects to Entgra IoT Server and pushes the Temperature readings.</p>
<p>The device supports MQTT and XMPP Communications. It is configured to use MQTT by <p>The device supports MQTT and XMPP Communications. It is configured to use MQTT by
default.</p> default.</p>
<br> <br>

@ -403,7 +403,7 @@ public class TestUtils {
public static List<Application> getApplications() { public static List<Application> getApplications() {
List<Application> applications = new ArrayList<>(); List<Application> applications = new ArrayList<>();
Application app = new Application(); Application app = new Application();
app.setName("WSO2 IoT Agent"); app.setName("Entgra IoT Agent");
app.setApplicationIdentifier("org.wos2.iot.agent"); app.setApplicationIdentifier("org.wos2.iot.agent");
app.setVersion("1.0.0"); app.setVersion("1.0.0");
app.setPlatform("Android"); app.setPlatform("Android");

@ -113,7 +113,7 @@
<i class="icon fw fw-warning"></i> <i class="icon fw fw-warning"></i>
The device location information is not available right now! Please refresh the page in a few minutes. 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 devices “Location Services setting” is disabled The location details will not be available if the devices “Location Services setting” is disabled
or if WSO2 IoT Server has not received the devices location information from the device. or if Entgra IoT Server has not received the devices location information from the device.
</h4> </h4>
</div> </div>
<p class="add-padding-5x"></p> <p class="add-padding-5x"></p>

@ -58,7 +58,7 @@
{{else}} {{else}}
href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device" href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device"
{{/if}} {{/if}}
target="_blank">WSO2 Device Cloud documentation.</a> target="_blank">Entgra Device Cloud documentation.</a>
</p> </p>
{{else}} {{else}}
<p class="doc-link text-center">Need help? Read <a <p class="doc-link text-center">Need help? Read <a
@ -67,7 +67,7 @@
{{else}} {{else}}
href="https://docs.wso2.com/display/IoTS320/Android" href="https://docs.wso2.com/display/IoTS320/Android"
{{/if}} {{/if}}
target="_blank">WSO2 IoT Server documentation.</a></p> target="_blank">Entgra IoT Server documentation.</a></p>
{{/if}} {{/if}}
</div> </div>

@ -403,7 +403,7 @@ public class TestUtils {
public static List<Application> getApplications() { public static List<Application> getApplications() {
List<Application> applications = new ArrayList<>(); List<Application> applications = new ArrayList<>();
Application app = new Application(); Application app = new Application();
app.setName("WSO2 IoT Agent"); app.setName("Entgra IoT Agent");
app.setApplicationIdentifier("org.wos2.iot.agent"); app.setApplicationIdentifier("org.wos2.iot.agent");
app.setVersion("1.0.0"); app.setVersion("1.0.0");
app.setPlatform("Android"); app.setPlatform("Android");

@ -93,7 +93,7 @@
<i class="icon fw fw-warning"></i> <i class="icon fw fw-warning"></i>
The device location information is not available right now! Please refresh the page in a few minutes. 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 devices “Location Services setting” is disabled The location details will not be available if the devices “Location Services setting” is disabled
or if WSO2 IoT Server has not received the devices location information from the device. or if Entgra IoT Server has not received the devices location information from the device.
</h4> </h4>
</div> </div>
<p class="add-padding-5x"></p> <p class="add-padding-5x"></p>

@ -15,7 +15,7 @@
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect and manage your Windows device with WSO2 IoT Server.</p> <p class="grey margin-top">Connect and manage your Windows device with Entgra IoT Server.</p>
<br> <br>
<a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a> <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>

@ -1,5 +1,5 @@
{ {
"appName": "WSO2 IoT Server", "appName": "Entgra IoT Server",
"cachingEnabled": true, "cachingEnabled": true,
"debuggingEnabled": false, "debuggingEnabled": false,
"permissionRoot": "/", "permissionRoot": "/",
@ -38,8 +38,8 @@
}, },
"generalConfig" : { "generalConfig" : {
"host" : "https://localhost:9443", "host" : "https://localhost:9443",
"companyName" : "WSO2 IoT Server", "companyName" : "Entgra IoT Server",
"browserTitle" : "WSO2 IoT Server", "browserTitle" : "Entgra IoT Server",
"copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightPrefix" : "\u00A9 %date-year%, ",
"copyrightOwner" : "WSO2 Inc.", "copyrightOwner" : "WSO2 Inc.",
"copyrightOwnersSite" : "http://www.wso2.org", "copyrightOwnersSite" : "http://www.wso2.org",

@ -20,8 +20,8 @@
"windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication", "windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication",
"generalConfig" : { "generalConfig" : {
"host" : "%http.ip%", "host" : "%http.ip%",
"companyName" : "WSO2 IoT Server", "companyName" : "Entgra IoT Server",
"browserTitle" : "WSO2 IoT Server", "browserTitle" : "Entgra IoT Server",
"copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved." "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."
}, },
"isOAuthEnabled" : true, "isOAuthEnabled" : true,

@ -32,7 +32,7 @@ under the License. --}}
{{ {{
unit "mdm.unit.wizard-stepper" unit "mdm.unit.wizard-stepper"
steps = "Start Workplace, steps = "Start Workplace,
Login to WSO2 IoT Server, Login to Entgra IoT Server,
Accept End User License Agreement" Accept End User License Agreement"
currentStep = "Start Workplace" currentStep = "Start Workplace"
currentStepIndex = 0 currentStepIndex = 0
@ -40,7 +40,7 @@ under the License. --}}
Start the Workplace app to continue device enrollment. Start the Workplace app to continue device enrollment.
<br class="c-both" /> <br class="c-both" />
<br class="c-both" /> <br class="c-both" />
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 will offer you company policies, certificates and apps that help you connect
to your business. to your business.
<br class="c-both" /> <br class="c-both" />

@ -32,7 +32,7 @@ under the License. --}}
{{ {{
unit "mdm.unit.wizard-stepper" unit "mdm.unit.wizard-stepper"
steps = "Start Workplace, steps = "Start Workplace,
Login to WSO2 IoT Server, Login to Entgra IoT Server,
Accept End User License Agreement" Accept End User License Agreement"
currentStep = "Accept End User License Agreement" currentStep = "Accept End User License Agreement"
currentStepIndex = 2 currentStepIndex = 2

@ -25,7 +25,7 @@ under the License. --}}
}} }}
{{/zone}} {{/zone}}
{{!-- Inputting content into defined zones in enrollment layout --}} {{!-- 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"}} {{#zone "headerTitle"}}
Windows Phone Enrollment Windows Phone Enrollment
{{/zone}} {{/zone}}
@ -33,9 +33,9 @@ under the License. --}}
{{ {{
unit "mdm.unit.wizard-stepper" unit "mdm.unit.wizard-stepper"
steps = "Start Workplace, steps = "Start Workplace,
Login to WSO2 IoT Server, Login to Entgra IoT Server,
Accept End User License Agreement" Accept End User License Agreement"
currentStep = "Login to WSO2 IoT Server" currentStep = "Login to Entgra IoT Server"
currentStepIndex = 1 currentStepIndex = 1
}} }}
{{ {{

@ -17,8 +17,8 @@
}} }}
{{#zone "brand"}} {{#zone "brand"}}
<a href="{{@app.context}}/"> <a href="{{@app.context}}/">
<img src="{{@unit.publicUri}}/img/logo.png" alt="WSO2 IoT" <img src="{{@unit.publicUri}}/img/logo.png" alt="Entgra IoT"
title="WSO2 IoT" class="logo" /> title="Entgra IoT" class="logo" />
<h2 class="app-title"><span>WSO2 IoT</span></h2> <h2 class="app-title"><span>Entgra IoT</span></h2>
</a> </a>
{{/zone}} {{/zone}}

@ -21,7 +21,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
echo "| WSO2 IOT Sample " echo "| Entgra IOT Sample "
echo "| RaspiAgent " echo "| RaspiAgent "
echo "| ---------------- " echo "| ---------------- "
echo "| ....initializing service-start-script " echo "| ....initializing service-start-script "

@ -21,7 +21,7 @@
#!/bin/bash #!/bin/bash
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
echo "| WSO2 IOT Sample " echo "| Entgra IOT Sample "
echo "| RaspiAgent " echo "| RaspiAgent "
echo "| ---------------- " echo "| ---------------- "
echo "| ....initializing startup-script " echo "| ....initializing startup-script "

@ -1,6 +1,6 @@
@echo off @echo off
echo. echo.
echo.WSO2 IOT Sample echo.Entgra IOT Sample
echo.Virtual Fire Alarm echo.Virtual Fire Alarm
echo.initializing agent echo.initializing agent
echo. echo.

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
echo "----------------------------------------------------------------" echo "----------------------------------------------------------------"
echo "| WSO2 IOT Sample " echo "| Entgra IOT Sample "
echo "| Virtual RaspiAlarm " echo "| Virtual RaspiAlarm "
echo "| ---------------- " echo "| ---------------- "
echo "| ....initializing startup-script " echo "| ....initializing startup-script "

@ -16,12 +16,12 @@
under the License. under the License.
*# *#
<EmailConfig> <EmailConfig>
<Subject>You have been invited to enroll your Android device in WSO2 IoT</Subject> <Subject>You have been invited to enroll your Android device in Entgra IoT</Subject>
<Body> <Body>
<![CDATA[ <![CDATA[
<html> <html>
<head> <head>
<title>WSO2 IoT Server</title> <title>Entgra IoT Server</title>
</head> </head>
<body style="color: #666666; background-color:#cdcdcd; padding: 0px; margin: 0px;"> <body style="color: #666666; background-color:#cdcdcd; padding: 0px; margin: 0px;">
<div style="background-color:#cdcdcd; font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; padding: 20px 0px; margin: 0px;"> <div style="background-color:#cdcdcd; font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; padding: 20px 0px; margin: 0px;">
@ -38,7 +38,7 @@
</p> </p>
<p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"> <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;">
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 <a href="$base-url-https/devicemgt/public/cdmf.unit.device.type.android.type-view/assets/android-agent.apk">here</a> to download device agent in to Click <a href="$base-url-https/devicemgt/public/cdmf.unit.device.type.android.type-view/assets/android-agent.apk">here</a> to download device agent in to
your Android device.</p> your Android device.</p>
@ -51,7 +51,7 @@
</p> </p>
<p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"> <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;">
WSO2 IoT Administrator Entgra IoT Administrator
</p> </p>
</div> </div>
<div style="background-color: #333333; border-bottom-left-radius: 10px; border-bottom-right-radius: 10px;"> <div style="background-color: #333333; border-bottom-left-radius: 10px; border-bottom-right-radius: 10px;">

Loading…
Cancel
Save