diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.ui.header.logo/logo.json b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.ui.header.logo/logo.json index 98b47e9b87..4e30bc0747 100644 --- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.ui.header.logo/logo.json +++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.ui.header.logo/logo.json @@ -1,5 +1,5 @@ { "version": "1.0.0", "index": 29, - "extends": "cdmf.unit.ui.header.logo" + "extends": "mdm.unit.ui.header.logo" } \ No newline at end of file diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf index 1952b79b09..6074b856e8 100644 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf +++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf @@ -1,21 +1,13 @@ instructions.configure = \ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/virtual_firealarm/);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/agent/,target:${installFolder}/../../resources/sketches/virtual_firealarm/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/virtual_firealarm_advanced/);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/advanced_agent/,target:${installFolder}/../../resources/sketches/virtual_firealarm_advanced/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/publisher/samples/assets/deviceTypes/virtual_firealarm/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/ui/artifact/,target:${installFolder}/../../deployment/server/jaggeryapps/publisher/samples/assets/deviceTypes/virtual_firealarm/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/iotserver/pages/devices/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/ui/page/,target:${installFolder}/../../deployment/server/jaggeryapps/iotserver/pages/devices/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/iotserver/units/virtual_firealarm/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/ui/units/,target:${installFolder}/../../deployment/server/jaggeryapps/iotserver/units/virtual_firealarm/,overwrite:true);\ org.wso2.carbon.p2.touchpoint.addXMLElement(file:${installFolder}/../../conf/iot/iot-config.xml,xpath:/IoTDeviceTypeConfigManager,element:jdbc/${data_source}); \ -org.wso2.carbon.p2.touchpoint.addXMLElement(file:${installFolder}/../../conf/datasources/master-datasources.xml,xpath:/datasources-configuration/datasources,element:${data_source}The datasource used for the Virtual-Firealarm databasejdbc/${data_source}jdbc:h2:repository/database/${data_source};DB_CLOSE_ON_EXIT=FALSEwso2carbonwso2carbonorg.h2.Driver5060000trueSELECT 130000); \ +org.wso2.carbon.p2.touchpoint.addXMLElement(file:${installFolder}/../../conf/datasources/master-datasources.xml,xpath:/datasources-configuration/datasources,element:${data_source}The datasource used for the Virtual-Firealarm databasejdbc/${data_source}jdbc${#58}h2${#58}repository/database/${data_source}${#59}DB_CLOSE_ON_EXIT=FALSEwso2carbonwso2carbonorg.h2.Driver5060000trueSELECT 130000); \ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/virtual_firealarm,overwrite:true);\ - - - - - +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.devicemgt.ui_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/deviceType.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/deviceType.json deleted file mode 100644 index 825bdb078b..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/deviceType.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "virtual_firealarm", - "tags": "WSO2, IoT, Raspberry, Fire Alarm, Virtual", - "rate": 3, - "attributes": { - "overview_status": "PUBLISHED", - "overview_provider":"admin", - "overview_version":"1.0.0", - "overview_name":"virtual_firealarm", - "overview_url":"http://www.google.lk", - "setupGuide_guideImage":"virtual_firealarm/guide.png", - "overview_actionLabel":"Create a virtual device", - "sketches_Sketches":["virtual_firealarm","virtual_firealarm_advanced"], - "ingredients_ingredients":[ - "Virtual Agent that simulates an actual firealarm. Simple agent demonstrate the basic functionality and Advanced agent consists with advance features like policy management, edge computing etc." - ], - "overview_description":"Download our Virtual Agent and try-it out for close to real simulation of the FireAlarm Device-Type", - "setupGuide_description":"Extract the downloaded agent and run start-device.sh to start agent", - "quickStartupSteps_stepDescription":["Download the Virtual Agent","Run the 'start-device.sh' script","Provide the push-interval and network-interface"], - "quickStartupSteps_stepLabel":["1","2","3"], - "images_thumbnail":"virtual_firealarm/virtual_firealarm_thumbnail.png", - "images_banner":"virtual_firealarm/virtual_firealarm_banner.png", - "overview_thumbnail": "images_thumbnail" - } -} \ No newline at end of file diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/guide.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/guide.png deleted file mode 100644 index 7fbc6c1877..0000000000 Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/guide.png and /dev/null differ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/virtual_firealarm_banner.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/virtual_firealarm_banner.png deleted file mode 100644 index 80eaced35d..0000000000 Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/virtual_firealarm_banner.png and /dev/null differ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/virtual_firealarm_thumbnail.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/virtual_firealarm_thumbnail.png deleted file mode 100644 index dcaa711eea..0000000000 Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/artifact/virtual_firealarm_thumbnail.png and /dev/null differ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/page/virtual_firealarm.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/page/virtual_firealarm.hbs deleted file mode 100644 index 30fb2abd4a..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/page/virtual_firealarm.hbs +++ /dev/null @@ -1,8 +0,0 @@ -{{layout "fluid"}} -{{#zone "title"}} - WSO2 IoT Server | Virtual FireAlarm -{{/zone}} -{{#zone "body"}} - {{unit "appbar" link="dashboard" enableBack="true" title="Virtual FireAlarm"}} - {{unit "virtual_firealarm"}} -{{/zone}} \ No newline at end of file diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/schematicsGuide.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/schematicsGuide.png deleted file mode 100644 index b247bf65e2..0000000000 Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/schematicsGuide.png and /dev/null differ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/virtual_firealarm-thumb.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/virtual_firealarm-thumb.png deleted file mode 100644 index aaf16925fd..0000000000 Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/virtual_firealarm-thumb.png and /dev/null differ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/virtual_firealarm.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/virtual_firealarm.png deleted file mode 100644 index f9961cf089..0000000000 Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/images/virtual_firealarm.png and /dev/null differ diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/js/virtual_firealarm.js b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/js/virtual_firealarm.js deleted file mode 100644 index 42f877d2b3..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/js/virtual_firealarm.js +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -var modalPopup = ".wr-modalpopup"; -var modalPopupContainer = modalPopup + " .modalpopup-container"; -var modalPopupContent = modalPopup + " .modalpopup-content"; -var body = "body"; - -/* - * set popup maximum height function. - */ -function setPopupMaxHeight() { - $(modalPopupContent).css('max-height', ($(body).height() - ($(body).height() / 100 * 30))); - $(modalPopupContainer).css('margin-top', (-($(modalPopupContainer).height() / 2))); -} - -/* - * show popup function. - */ -function showPopup() { - $(modalPopup).show(); - setPopupMaxHeight(); -} - -/* - * hide popup function. - */ -function hidePopup() { - $(modalPopupContent).html(''); - $(modalPopup).hide(); -} - -/* - * DOM ready functions. - */ -$(document).ready(function () { - attachEvents(); -}); - -function attachEvents() { - /** - * Following click function would execute - * when a user clicks on "Download" link - * on Device Management page in WSO2 DC Console. - */ - $("a.download-link").click(function () { - var sketchType = $(this).data("sketchtype"); - var deviceType = $(this).data("devicetype"); - var downloadDeviceAPI = "/iotserver/api/device/sketch/generate_link"; - var payload = {"sketchType":sketchType, "deviceType":deviceType}; - console.log(payload); - $(modalPopupContent).html($('#download-device-modal-content').html()); - showPopup(); - - $("a#download-device-download-link").click(function () { - invokerUtil.post( - downloadDeviceAPI, - payload, - function (data, textStatus, jqxhr) { - if(jqxhr.status == 200) { - if(data == "403"){ - $(modalPopupContent).html($('#device-403-content').html()); - $("#device-403-link").click(function () { - window.location = "/iotserver/login"; - }); - showPopup(); - }else { - $(modalPopupContent).html($('#download-device-modal-content-links').html()); - $("#download-device-url").val(data); - $("#download-device-url").focus(function () { - $(this).select(); - }); - showPopup(); - } - }else{ - $(modalPopupContent).html($('#device-403-content').html()); - $("#device-403-link").click(function () { - window.location.reload(); - }); - showPopup(); - } - }, - function () { - $(modalPopupContent).html($('#device-unexpected-error-content').html()); - $("a#device-unexpected-error-link").click(function () { - hidePopup(); - }); - } - ); - }); - - $("a#download-device-cancel-link").click(function () { - hidePopup(); - }); - - }); -} diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/store.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/store.json deleted file mode 100644 index 793feca5af..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/public/store.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "title" : "Virtual Firealarm", - "description":"Connect and Test a Virtual Firealarm over the WSO2 IoT Server" -} \ No newline at end of file diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.hbs deleted file mode 100644 index 76d8a60a21..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.hbs +++ /dev/null @@ -1,213 +0,0 @@ -{{#zone "main"}} -
-
-
-
-

Fire Alarm

-
-

Connect your Fire Alarm device - to the WSO2 IoT server.

-
-
- -
-
-

Ingredients

-
-

Hardware Requirements

-
- - - - Raspberry Pi (Internet Enabled) -       - - - - DHT11 Temperature Sensor

- - - - LED -                      -                      -           - - - - Buzzer(3v)

- Download - -
- -
-
-

Prepare

-

Get your device ready

-
- 01 Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup. -
-
- 02 Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device. -
-
- 03 Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS -
-
-
-

Schematic Diagram

-

Click on the image to zoom

-
- - - -
-
-
-
-
-

Connect (Quickstart)

-
-

Internet of Things Foundation Quickstart connection

-
- 01 Click on the "Create DEB" button above to get the download link for the FireAlarm setup files
-
-
-
- (The following commands can be issued by directly typing into the terminal of the device or by an "ssh" login from a remote PC) -
-
- 02 Download the FireAlarm setup files using the following command: "curl -k <url_link_received_from_the_above_step> > Agent.zip"
-                 This will download a zip file named "Agent.zip" -
-
- - 03 Run the following commands to successfuly install the package and get the service running:
-                cd <PATH_WHERE_THE_DOWNLOADED_"Agent.zip"_FILE_IS>
-              unzip Agent.zip -d Agent
-              cd Agent
-              sudo chmod 755 startservice.sh
-              sudo ./startservice.sh
- -
- - -
- 04 Follow the installation instructions and complete installation. Upon completion the Agent would have started automatically
-
-
-
-
- -
-
-
-
-

Please download the file from following link.

-
-
-
- - - -    - -     Copy Link     - -    -
-
-
-
-
-
- -
-
-
-
-

Please download the file from following link(Press CTRL+C).

-
-
- -
-
-
-
-
- -
-
-
-
-

Exception at backend. Try Later.

-
- -     Ok     - -
-
-
-
-
- -
-
-
-
-

Action not permitted.

-
- -     Ok     - -
-
-
-
-
- -
-
-
-
-

Device Sketch does not exist.

-
- -     Ok     - -
-
-
-
-
- -
-
-
-
-

Unexpected error.

-
- -     Ok     - -
-
-
-
-
- -{{/zone}} -{{#zone "topCss"}} - - -{{/zone}} -{{#zone "bottomJs"}} - -{{/zone}} diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.js b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.js deleted file mode 100644 index 68606eea3b..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.js +++ /dev/null @@ -1,4 +0,0 @@ -function onRequest(context){ - context.sketchPath = "../api/device/sketch/download"; - return context; -} diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.json deleted file mode 100644 index 3dbff381da..0000000000 --- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/ui/units/virtual_firealarm.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "predicate": "false" -} \ No newline at end of file