Merge branch 'master' into 'master'

Fix IoT device deploying issue

See merge request entgra/product-iots!2
merge-requests/4/head
Charitha Goonetilleke 6 years ago
commit ade1a5c021

@ -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"

@ -1,19 +1,19 @@
# Welcome to WSO2 IoT Server
# Welcome to Entgra IoT Server
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
[![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.3.0.zip file; this will create a folder named wso2iot-3.3.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.3.0/bin/broker.sh [.bat]
* wso2iot-3.3.0/bin/iot-server.sh [.bat]
* wso2iot-3.3.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

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId>
<artifactId>analytics-devicetype-feature-installation</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<packaging>pom</packaging>
<name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics</name>
<url>http://wso2.org</url>
@ -66,6 +66,11 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Android Sense Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@ -94,6 +99,10 @@
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -199,6 +208,38 @@
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>entgra-nexus</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.releases</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.snapshots</id>
<name>Entgra Snapshot Repository</name>
<url>http://nexus.entgra.io/repository/maven-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<properties>

@ -16,9 +16,9 @@
# under the License.
#
product.name=WSO2 IoT Server
product.name=Entgra IoT Server
product.key=IoT
product.version=3.3.0
product.version=3.4.0
product.doc.version=330
carbon.version=4.4.26

@ -36,7 +36,7 @@
<!--
Product Version
-->
<Version>3.3.0</Version>
<Version>3.4.0</Version>
<!--
Host name or IP address of the machine hosting this server

@ -193,6 +193,6 @@ goto end
:invalidUsage
echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance]
echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.3.0\ -pid 5151
echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.4.0\ -pid 5151
:END

@ -8,15 +8,15 @@
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
<h1>Release Note - WSO2 IoT Server Version 3.3.0</h1>
<h1>Release Note - Entgra IoT Server Version 3.4.0</h1>
<h2>We are pleased to announce WSO2 IoT Server 3.3.0.</h2>
<h2>We are pleased to announce Entgra IoT Server 3.4.0.</h2>
<p>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. </p>
<p>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. </p>
<p>These capabilities involve device management, smart analytics, API and app management for devices, transport extensions for MQTT, XMPP and many more.</p>
<h4>What's new in WSO2 IoTS 3.3.0</h4>
<h4>What's new in Entgra IoTS 3.4.0</h4>
<ul>
<li>Support for DEP(Apple Device Enrolment Program) </li>
@ -37,11 +37,11 @@
<h4>Documentation</h4>
Documentations: <a href='https://docs.wso2.com/display/IoTS320/WSO2+IoT+Server+Documentation'> WSO2 IoT Server Documentation</a>
Documentations: <a href='https://entgra.atlassian.net/wiki/spaces/IoTS340/overview'> Entgra IoT Server Documentation</a>
<h4>Known Issues</h4>
The known set of issues this version can be found <a href='https://github.com/wso2/product-iots/issues?q=is%3Aopen+is%3Aissue+label%3A3.3.0'> here.</a>
The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=%E2%9C%93&state=opened&milestone_title=IoTS%203.4.0-GA'> here.</a>
<h3>Engaging with Community</h3>
@ -49,21 +49,21 @@ The known set of issues this version can be found <a href='https://github.com/ws
<p>Join our mailing list and correspondence with the developers directly.</p>
<p>Developer list: <a href="mailto:dev@wso2.org">dev@wso2.org</a> | <a href="mailto:dev-request@wso2.org?subject=subscribe">Subscribe</a> | <a href="http://mail.wso2.org/mailarchive/dev/">Mail Archive</a></p>
<p>Developer list: <a href="mailto:dev@entgra.org">dev@entgra.org</a></p>
<h4>Reporting Issues</h4>
<p>We encourage you to report issues, documentation faults and feature requests regarding WSO2 IoT Server through <a href="https://github.com/wso2/product-iots/issues">WSO2 IoT GIT Issues</a>.</p>
<p>We encourage you to report issues, documentation faults and feature requests regarding Entgra IoT Server through <a href="https://gitlab.com/entgra/product-iots/issues">Entgra IoT GIT Issues</a>.</p>
<h4>Discussion Forums</h4>
<p>We encourage you to use <a href="http://stackoverflow.com/questions/tagged/wso2iots%20or%20wso2emm%20or%20wso2iot%20or%20wso2-emm">stackoverflow</a> to engage with developers as well as other users.</p>
<p>For more information about WSO2 IoT Server, please see <a href="http://wso2.com/products/iot-server">http://wso2.com/products/iot-server</a> or visit the <a href="http://wso2.com/library/">WSO2 Oxygen Tank</a> developer portal for additional resources.</p>
<p>For more information about Entgra IoT Server, please see <a href="https://www.entgra.io/">https://www.entgra.io</a></p>
<p>Thank you for your interest in WSO2 IoT Server.</p>
<p>Thank you for your interest in Entgra IoT Server.</p>
<p><strong><em>The WSO2 IoT Server Team</em></strong></p>
<p><strong><em>The Entgra IoT Server Team</em></strong></p>
</body>
</html>

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.devicemgt-plugins</groupId>
<artifactId>iot-devicetype-feature-installation</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<packaging>pom</packaging>
<name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - IoT Core</name>
<url>http://wso2.org</url>
@ -78,6 +78,14 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Android Sense Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@ -123,6 +131,16 @@
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Android Sense Device Type Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -156,6 +174,12 @@
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Android Sense Device Type UI Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -189,6 +213,12 @@
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Android Sense Device Type BE Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -271,6 +301,38 @@
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>entgra-nexus</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.releases</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.snapshots</id>
<name>Entgra Snapshot Repository</name>
<url>http://nexus.entgra.io/repository/maven-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<properties>

@ -2,7 +2,7 @@
echo ""
echo "----------------------------------------"
echo "WSO2 IoT Server IP configuration tool"
echo "Entgra IoT Server IP configuration tool"
echo "----------------------------------------"

@ -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 "----------------------------------------"

@ -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

@ -1869,7 +1869,7 @@
<enabled>false</enabled>
</releases>
</repository>
<repository>
<repository>
<id>entgra-nexus</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-public/</url>

Loading…
Cancel
Save