From e4c9477bf7434b78cb94feda63fe98f37c0b3964 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Fri, 5 Oct 2018 16:05:54 +0530 Subject: [PATCH 1/3] Fix IoT device deploying issue --- .gitlab-ci.yml | 2 +- README.md | 8 +-- .../analytics/samples/device-plugins/pom.xml | 43 ++++++++++++- .../src/assembly/filter.properties | 2 +- .../distribution/src/broker/conf/carbon.xml | 2 +- .../distribution/src/core/bin/carbondump.bat | 2 +- .../distribution/src/core/release-notes.html | 8 +-- .../core/samples/device-plugins-deployer.xml | 64 ++++++++++++++++++- .../scripts/mobile-qsg/resources/Readme.txt | 2 +- pom.xml | 2 +- 10 files changed, 119 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcf28eb6..24c4635d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" - # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used + # As of Maven 3.4.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used # when running from the command line. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. MAVEN_CLI_OPTS: "--batch-mode --errors --show-version" diff --git a/README.md b/README.md index c2a5c9de..891478c4 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,11 @@ http://docs.wso2.com/iot-server. * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded wso2iot-3.3.0.zip file; this will create a folder named ‘wso2iot-3.3.0’. +* Extract the downloaded wso2iot-3.4.0.zip file; this will create a folder named ‘wso2iot-3.4.0’. * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: - * wso2iot-3.3.0/bin/broker.sh [.bat] - * wso2iot-3.3.0/bin/iot-server.sh [.bat] - * wso2iot-3.3.0/bin/analytics.sh [.bat] + * wso2iot-3.4.0/bin/broker.sh [.bat] + * wso2iot-3.4.0/bin/iot-server.sh [.bat] + * wso2iot-3.4.0/bin/analytics.sh [.bat] ### How to Contribute diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml index 9fd1d18a..9a3b1e7b 100644 --- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml +++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.analytics.devicemgt-plugins analytics-devicetype-feature-installation - 3.3.0 + 3.4.0 pom Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics http://wso2.org @@ -66,6 +66,11 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature:${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version} + @@ -94,6 +99,10 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group + ${carbon.device.mgt.plugin.version} + @@ -199,6 +208,38 @@ false + + entgra-nexus + Entgra internal Repository + http://nexus.entgra.io/repository/maven-public/ + + true + daily + ignore + + + + entgra.releases + Entgra internal Repository + http://nexus.entgra.io/repository/maven-releases/ + + true + daily + ignore + + + + entgra.snapshots + Entgra Snapshot Repository + http://nexus.entgra.io/repository/maven-snapshots/ + + true + daily + + + false + + diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 7d40938e..3ac47c16 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -18,7 +18,7 @@ product.name=WSO2 IoT Server product.key=IoT -product.version=3.3.0 +product.version=3.4.0 product.doc.version=330 carbon.version=4.4.26 diff --git a/modules/distribution/src/broker/conf/carbon.xml b/modules/distribution/src/broker/conf/carbon.xml index 2f64f008..8e0549d3 100755 --- a/modules/distribution/src/broker/conf/carbon.xml +++ b/modules/distribution/src/broker/conf/carbon.xml @@ -36,7 +36,7 @@ - 3.3.0 + 3.4.0 + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version} + @@ -123,6 +131,16 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group + ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group + ${carbon.device.mgt.plugin.version} + @@ -156,6 +174,12 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group + ${carbon.device.mgt.plugin.version} + @@ -189,6 +213,12 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group + ${carbon.device.mgt.plugin.version} + @@ -271,6 +301,38 @@ false + + entgra-nexus + Entgra internal Repository + http://nexus.entgra.io/repository/maven-public/ + + true + daily + ignore + + + + entgra.releases + Entgra internal Repository + http://nexus.entgra.io/repository/maven-releases/ + + true + daily + ignore + + + + entgra.snapshots + Entgra Snapshot Repository + http://nexus.entgra.io/repository/maven-snapshots/ + + true + daily + + + false + + diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt index f896b55e..745e68f5 100644 --- a/modules/scripts/mobile-qsg/resources/Readme.txt +++ b/modules/scripts/mobile-qsg/resources/Readme.txt @@ -1,5 +1,5 @@ -WSO2 IoTs 3.3.0 QSG Setup Guide +WSO2 IoTs 3.4.0 QSG Setup Guide --------------------------------- 1. Start the WSO2 IoTS server diff --git a/pom.xml b/pom.xml index b75c608f..d8dcbca3 100644 --- a/pom.xml +++ b/pom.xml @@ -1869,7 +1869,7 @@ false - + entgra-nexus Entgra internal Repository http://nexus.entgra.io/repository/maven-public/ From ab92a2fda64eaef61937b6e8a71554832426ec27 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 8 Oct 2018 10:30:26 +0530 Subject: [PATCH 2/3] Fix script white labeling issue --- modules/scripts/change-ip.sh | 2 +- modules/scripts/change-superadmin-credentials.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh index 705cd4e9..144549e5 100644 --- a/modules/scripts/change-ip.sh +++ b/modules/scripts/change-ip.sh @@ -2,7 +2,7 @@ echo "" echo "----------------------------------------" -echo "WSO2 IoT Server IP configuration tool" +echo "Entgra IoT Server IP configuration tool" echo "----------------------------------------" diff --git a/modules/scripts/change-superadmin-credentials.sh b/modules/scripts/change-superadmin-credentials.sh index 369739cc..d758370a 100755 --- a/modules/scripts/change-superadmin-credentials.sh +++ b/modules/scripts/change-superadmin-credentials.sh @@ -2,7 +2,7 @@ echo "" echo "----------------------------------------" -echo "WSO2 IoT Server Super Admin Credentials Changing tool" +echo "Entgra IoT Server Super Admin Credentials Changing tool" echo "----------------------------------------" From 30182eb230345c929886897dd3f526505bbe0114 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 8 Oct 2018 11:44:59 +0530 Subject: [PATCH 3/3] White labeling Readme --- README.md | 29 +++++++++---------- .../src/assembly/filter.properties | 2 +- .../distribution/src/core/release-notes.html | 22 +++++++------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 891478c4..85b398ae 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -# Welcome to WSO2 IoT Server +# Welcome to Entgra IoT Server
[![pipeline status](https://gitlab.com/entgra/product-iots/badges/master/pipeline.svg)](https://gitlab.com/entgra/product-iots/commits/master) -WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. +Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. It also offers a complete and secure enterprise mobility management (EMM/MDM) solution that aims to address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows devices, it helps organizations deal with both corporate owned, personally enabled (COPE) and employee-owned devices with the bring your own device (BYOD) concept. -WSO2 IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state. +Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state. Find the online documentation at : -http://docs.wso2.com/iot-server. +https://entgra.atlassian.net/wiki/spaces/IoTS340/overview. -### Key Features of WSO2 IoT Server +### Key Features of Entgra IoT Server #### Generic framework for Device Management * Extensions for registering built-in/custom device types @@ -21,7 +21,7 @@ http://docs.wso2.com/iot-server. * Group, manage and monitor connected devices * Share device operations/data with other users * Distribute and manage applications/firmware of devices -* Edge computing powered by the WSO2 Complex Event Processor (CEP) streaming engine (Siddhi - https://github.com/wso2/siddhi) +* Edge computing powered by the Entgra Complex Event Processor (CEP) streaming engine (Siddhi - https://github.com/wso2/siddhi) * Out of the Box support for some known device types such as Raspberry Pi, Arduino Uno etc. * Supports mobile platforms such as Android, Windows, and iOS. @@ -53,21 +53,20 @@ http://docs.wso2.com/iot-server. * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded wso2iot-3.4.0.zip file; this will create a folder named ‘wso2iot-3.4.0’. +* Extract the downloaded entgraiot-3.4.0.zip file; this will create a folder named ‘entgraiot-3.4.0’. * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: - * wso2iot-3.4.0/bin/broker.sh [.bat] - * wso2iot-3.4.0/bin/iot-server.sh [.bat] - * wso2iot-3.4.0/bin/analytics.sh [.bat] + * entgraiot-3.4.0/bin/broker.sh [.bat] + * entgraiot-3.4.0/bin/iot-server.sh [.bat] + * entgraiot-3.4.0/bin/analytics.sh [.bat] ### How to Contribute -* WSO2 IoT Server code is hosted in [GitHub](https://github.com/wso2/product-iots). -* Please report issues at [IoT Server Git Issues](https://github.com/wso2/product-iots/issues) and Send your pull requests to [development branch](https://github.com/wso2/product-iots). +* Entgra IoT Server code is hosted in [GitLab](https://gitlab.com/entgra/product-iots). +* Please report issues at [IoT Server Git Issues](https://gitlab.com/entgra/product-iots/issues) and Send your pull requests to [development branch](https://gitlab.com/entgra/product-iots). ### Contact us -WSO2 IoT Server developers can be contacted via the mailing lists: +Entgra IoT Server developers can be contacted via the mailing lists: -* WSO2 Developers List : dev@wso2.org -* WSO2 Architecture List : architecture@wso2.org +* Entgra Developers List : dev@entgra.org diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 3ac47c16..e59a6547 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -16,7 +16,7 @@ # under the License. # -product.name=WSO2 IoT Server +product.name=Entgra IoT Server product.key=IoT product.version=3.4.0 product.doc.version=330 diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html index 248b03d3..7a85dfb7 100644 --- a/modules/distribution/src/core/release-notes.html +++ b/modules/distribution/src/core/release-notes.html @@ -8,15 +8,15 @@
-

Release Note - WSO2 IoT Server Version 3.4.0

+

Release Note - Entgra IoT Server Version 3.4.0

-

We are pleased to announce WSO2 IoT Server 3.4.0.

+

We are pleased to announce Entgra IoT Server 3.4.0.

-

WSO2 IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as well as rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build.

+

Entgra IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as well as rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build.

These capabilities involve device management, smart analytics, API and app management for devices, transport extensions for MQTT, XMPP and many more.

-

What's new in WSO2 IoTS 3.4.0

+

What's new in Entgra IoTS 3.4.0

  • Support for DEP(Apple Device Enrolment Program)
    • @@ -37,11 +37,11 @@

    Documentation

    -Documentations: WSO2 IoT Server Documentation +Documentations: Entgra IoT Server Documentation

    Known Issues

    -The known set of issues this version can be found here. +The known set of issues this version can be found here.

    Engaging with Community

    @@ -49,21 +49,21 @@ The known set of issues this version can be found