adding a nicer view for some documents

This reverts commit 04a8929a

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.travis.yml

@@ -1,26 +1,26 @@
 services:
-  - docker
+- docker
 dist: xenial
 before_script:
-  - sudo apt update
+- sudo apt update
-  - sudo apt install qemu-user-static python3 python3-pip python3-setuptools
+- sudo apt install qemu-user-static python3 python3-pip python3-setuptools
-  - sudo pip3 install --upgrade pip
+- sudo pip3 install --upgrade pip
-  - sudo python3 -m pip install --upgrade setuptools
+- sudo python3 -m pip install --upgrade setuptools
-  - sudo python3 -m pip install --upgrade pyresttest
+- sudo python3 -m pip install --upgrade pyresttest
-  - "./create-binary-docker backend"
+- "./create-binary-docker backend"
-  - "./create-binary-docker backend -a arm"
+- "./create-binary-docker backend -a arm"
-  - "./create-binary-docker gateway"
+- "./create-binary-docker gateway"
-  - "./create-binary-docker gateway -a arm"
+- "./create-binary-docker gateway -a arm"
-  - "./create-binary-docker orioncontextbroker"
+- "./create-binary-docker orioncontextbroker"
-  - "./create-binary-docker orioncontextbroker -a arm"
+- "./create-binary-docker orioncontextbroker -a arm"
-  - "./create-binary-docker influxdbapp"
+- "./create-binary-docker influxdbapp"
-  - "./create-binary-docker influxdbapp -a arm"
+- "./create-binary-docker influxdbapp -a arm"
-  - "./create-binary-docker cul868ipe"
+- "./create-binary-docker cul868ipe"
-  - "./create-binary-docker cul868ipe -a arm"
+- "./create-binary-docker cul868ipe -a arm"
-  - docker run -d --name backend -p 0.0.0.0:18000:18000 -e "ONEM2M_CSE_ID=backend" -e "ONEM2M_NOTIFICATION_DISABLED=false" openmtc/backend-amd64 -v
+- docker run -d --name backend -p 0.0.0.0:18000:18000 -e "ONEM2M_CSE_ID=backend" -e "ONEM2M_NOTIFICATION_DISABLED=false" openmtc/backend-amd64 -v
-  - docker logs backend
+- docker logs backend
-  - docker run -d --name gateway -p 0.0.0.0:8000:8000 -e "ONEM2M_HTTP_TRANSPORT_PORT=8000" -e "ONEM2M_CSE_ID=gateway" -e "ONEM2M_REMOTE_CSE_POA=<POA>" -e "ONEM2M_REMOTE_CSE_ID=backend" -e "ONEM2M_NOTIFICATION_DISABLED=false" -e "ONEM2M_REGISTRATION_DISABLED=false" openmtc/gateway-amd64 -v
+- docker run -d --name gateway -p 0.0.0.0:8000:8000 -e "ONEM2M_HTTP_TRANSPORT_PORT=8000" -e "ONEM2M_CSE_ID=gateway" -e "ONEM2M_REMOTE_CSE_POA=<POA>" -e "ONEM2M_REMOTE_CSE_ID=backend" -e "ONEM2M_NOTIFICATION_DISABLED=false" -e "ONEM2M_REGISTRATION_DISABLED=false" openmtc/gateway-amd64 -v
-  - docker logs gateway
+- docker logs gateway
 script:
   - docker tag openmtc/orioncontextbroker-amd64 openmtc/orion-context-broker-app-amd64
   - docker tag openmtc/orioncontextbroker-arm openmtc/orion-context-broker-app-arm
@@ -35,21 +35,6 @@ after_script:
 env:
   matrix:
     secure: oQe/MxxFrPPArxb6OFzOUwG2ZlA5GYekMR6qn0Y3101v82MdrIVgDILHR41iwykTtk1XpJPV9uabsRsvY4hBmbjYzihYZFOAzFf+/KU7wROtKum0fFfLjCPb8uGV41k1JTquB94FibXboVAP7rNL0Vrpl+FGUvMGatQBtwZnGvha6Ha07qTao+X9+0dJ4YvFlvcba/jfzBZBwHw7KHpRoiyKU0dPmXpHcqnZBFcNqRXhzdVrgx0auP/tghoshW5LQWkpTV11uSx/kYuby4oo8r8nB6L0rW1jYSXs9DHiTQCfCy24xlb9YJjCD9aFcjH0lIkVIqQwJYA67MzKYMK4XV684J/Jr3+jfVOoUt0bpZaTnk+r/uiFCtEsN7q0KUlvHLUAi1YNJhKs6CRrAH3GK25QByh+suzPzZoHP42F2LYP9URlzbDH+/v7CwNuw+9pHSmxEhs18LVmggwkMos3o3ArvzMLRNJ3QG1fdoxL/Ubqxhmvhy4rZi6vGQsiF64oX8PN0sRgXekTU/ma+6CTM6qhgkocMUYzT2r/6qd/9R3jmtxSZnikjkR6Iu9NLzAUY+cqnvvjohAvqYyj+tGlQfOPxAU9H4wXnbQWLBM8yn6yt2Ki+3+Jx4Owdv0oXVJpN0GWjMzIJ1nEus5odkWW+c4wcZb6m3Ak0PrzYPp2BgE=
-after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then
-    docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
-    docker push openmtc/backend-amd64;
-    docker push openmtc/backend-arm;
-    docker push openmtc/gateway-amd64;
-    docker push openmtc/gateway-arm;
-    docker push openmtc/orion-context-broker-app-amd64;
-    docker push openmtc/orion-context-broker-app-arm;
-    docker push openmtc/cul868-ipe-amd64;
-    docker push openmtc/cul868-ipe-arm;
-    docker push openmtc/influxdb-app-amd64;
-    docker push openmtc/influxdb-app-arm;
-    fi
 after_failure:
   - docker logs backend
   - docker logs gateway
-  - coveralls

CREDITS.md

@@ -1,6 +0,0 @@
-# Contributors ordered by number of commits
-
-Ronald Steinke <rst-fokus>  
-Christian Klopp <ckl-fokus>  
-Alexander Ortlieb <aor-fokus>  
-Jason Fox <jason-fox>  

README.md

@@ -6,14 +6,14 @@
 
 [![FIWARE IoT Agents](https://nexus.lab.fiware.org/static/badges/chapters/iot-agents.svg)](https://www.fiware.org/developers/catalogue/)
 [![License: Eclipse](https://img.shields.io/github/license/OpenMTC/OpenMTC.svg)](https://www.eclipse.org/legal/epl-v10.html)
-[![](https://img.shields.io/docker/pulls/openmtc/gateway-amd64.svg)](https://hub.docker.com/u/openmtc)
 [![Support badge](https://nexus.lab.fiware.org/repository/raw/public/badges/stackoverflow/iot-agents.svg)](https://stackoverflow.com/questions/tagged/fiware+iot)
 <br/>
 [![Documentation badge](https://img.shields.io/readthedocs/fiware-openmtc.svg)](http://fiware-openmtc.readthedocs.org/en/latest/?badge=latest)
-[![Build Status](https://travis-ci.org/OpenMTC/OpenMTC.svg?branch=master)](https://travis-ci.org/OpenMTC/OpenMTC)
-[![Coverage Status](https://coveralls.io/repos/github/OpenMTC/OpenMTC/badge.svg?branch=master)](https://coveralls.io/github/OpenMTC/OpenMTC?branch=master)
-[![Known Vulnerabilities](https://snyk.io/test/github/OpenMTC/OpenMTC/badge.svg?targetFile=openmtc-gevent%2Frequirements.txt)](https://snyk.io/test/github/OpenMTC/OpenMTC?targetFile=openmtc-gevent%2Frequirements.txt)
 ![Status](https://nexus.lab.fiware.org/static/badges/statuses/iot-openmtc.svg)
+[![](https://img.shields.io/docker/pulls/openmtc/gateway-amd64.svg)](https://hub.docker.com/u/openmtc)
+[![Build Status](https://travis-ci.org/OpenMTC/OpenMTC.svg?branch=master)](https://travis-ci.org/OpenMTC/OpenMTC)
+[![Known Vulnerabilities](https://snyk.io/test/github/OpenMTC/OpenMTC/badge.svg?targetFile=openmtc-gevent%2Frequirements.txt)](https://snyk.io/test/github/OpenMTC/OpenMTC?targetFile=openmtc-gevent%2Frequirements.txt)
+[![Coverage Status](https://coveralls.io/repos/github/OpenMTC/OpenMTC/badge.svg?branch=master)](https://coveralls.io/github/OpenMTC/OpenMTC?branch=master)
 
 The OpenMTC SDK aims to provide developers with a convenient yet flexible tool
 to write oneM2M compliant applications. This includes network applications
@@ -24,15 +24,14 @@ This project is part of [FIWARE](https://www.fiware.org/). For more information
 check the FIWARE Catalogue entry for the
 [IoT Agents](https://github.com/Fiware/catalogue/tree/master/iot-agents).
 
-| :octocat: [Git Repository](https://github.com/OpenMTC/OpenMTC) | :whale: [Docker Hub](https://hub.docker.com/u/openmtc) | :books: [Documentation](https://fiware-openmtc.readthedocs.io/) | :page_facing_up: [Site](https://www.openmtc.org/) | :mortar_board: [Academy](https://fiware-academy.readthedocs.io/en/latest/iot-agents/open-mtc) |
+| :books: [Documentation](https://fiware-openmtc.readthedocs.io) | :page_facing_up: [Site](http://www.openmtc.org) | :whale: [Docker Hub](https://hub.docker.com/u/openmtc) | :dart: [Roadmap](roadmap.md) |
-| -------------------------------------------------------------- | ------------------------------------------------------ | --------------------------------------------------------------- | ------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+|---|---|---|---|---|
 
 # Content
 
 -   [Install](#install)
 -   [Usage](#usage)
 -   [API](#api)
--   [Training](#training)
 -   [Quality Assurance](#quality-assurance)
 -   [Contributing](#contributing)
 -   [License](#license)
@@ -49,11 +48,6 @@ corresponding section of the
 Information about how to use the IoT Agent can be found in the
 [User & Programmers Manual](https://fiware-openmtc.readthedocs.io/en/latest/introduction).
 
-## Training
-
-Information about our Training can be found in the
-[Training Section](https://fiware-openmtc.readthedocs.io/en/latest/training/training-ipe-sensors/index.html).
-
 ## API
 
 Information about the REST API can be found in the
@@ -103,12 +97,12 @@ follows:
 
 ## Contributing
 
-Contribution guidelines are detailed in the [CREDITS](CREDITS.md) file.
+Contribution guidelines are detailed in the [CONTRIBUTIONS](https://github.com/OpenMTC/OpenMTC/blob/master/CONTRIBUTIONS.md) file.
 
 ## License
 
 The OpenMTC SDK is licensed under the Eclipse Public License (EPL)
 version 1.
 
-© 2018-2019 OpenMTC
+© 2018 OpenMTC
 

apps/InfluxdbApp/src/influxdbapp/__init__.py

@@ -2,7 +2,7 @@
 Transfer OpenMTC Data to an InfluxDB
 """
 
-__version__ = "1.3.0"
+__version__ = "1.2.0"
 __description__ = "InfluxdbApp"
 __author_name__ = "Christian Klopp"
 __author_mail__ = "christian.klopp@fokus.fraunhofer.de"

apps/OrionContextBroker/src/orioncontextbroker/__init__.py

@@ -3,7 +3,7 @@ This App will forward all incoming sensor traffic to the Fiware Orion Context
 Broker
 """
 
-__version__ = "1.3.0"
+__version__ = "1.2.0"
 __description__ = "OrionContextBroker"
 __author_name__ = "Christian Klopp"
 __author_mail__ = "christian.klopp@fokus.fraunhofer.de"

apps/csvInjector/src/csvinjector/__init__.py

@@ -2,7 +2,7 @@
 App to inject data from a csv file to OpenMTC
 """
 
-__version__ = "1.3.0"
+__version__ = "1.2.0"
 __description__ = "csvInjector"
 __author_name__ = "Christian Klopp"
 __author_mail__ = "christian.klopp@fokus.fraunhofer.de"

apps/mqttConnector/src/mqttconnector/__init__.py

@@ -2,7 +2,7 @@
 TODO: Add description here
 """
 
-__version__ = "1.3.0"
+__version__ = "1.2.0"
 __description__ = "mqttConnector"
 __author_name__ = "Ronald Steinke"
 __author_mail__ = "ronald.steinke@fokus.fraunhofer.de"

doc/example-apps/IoT-data-visualization.py

@@ -43,6 +43,6 @@ if __name__ == "__main__":
     from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
 
     ep = "http://localhost:8000"
-    Runner(DataVisualization(poas=['http://localhost:21345'])).run(ep)
+    Runner(DataVisualization(), port=6050, host='auto').run(ep)
 
 

doc/example-apps/data-aggregation.py

@@ -91,4 +91,4 @@ if __name__ == "__main__":
     from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
 
     ep = "http://localhost:8000"
-    Runner(DataAggregation(poas=['http://localhost:21346'])).run(ep)
+    Runner(DataAggregation(), port=6050, host='auto').run(ep)

doc/example-apps/simple-decision-2.py

@@ -19,4 +19,4 @@ if __name__ == "__main__":
     from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
 
     ep = "http://localhost:8000"
-    Runner(SimpleDecision2(poas=['http://localhost:21387'])).run(ep)
+    Runner(SimpleDecision2(), port=6050, host='auto').run(ep)

doc/example-apps/simple-decision.py

@@ -47,4 +47,4 @@ if __name__ == "__main__":
     from openmtc_app.flask_runner import SimpleFlaskRunner as Runner
 
     ep = "http://localhost:8000"
-    Runner(SimpleDecision(poas=['http://localhost:22245'])).run(ep)
+    Runner(SimpleDecision(), port=6050, host='auto').run(ep)

doc/example-apps/start-simple-app

@@ -31,6 +31,5 @@ app_file=${app_array[$[${choice}-1]]}
 ################################################################################
 # run app_file
 cd ${base_path}
-cd ..
+. ../../common/prep-env.sh
-. ../common/prep-env.sh
+python ${app_file}
-python3 ${app_file}

ipes/CUL868IPE/src/cul868ipe/__init__.py

@@ -2,7 +2,7 @@
 Interworking Proxy for Cul868 devices.
 """
 
-__version__ = "1.3.0"
+__version__ = "1.2.0"
 __description__ = "The OpenMTC Cul868IPE"
 __author_name__ = "Ronny Kreuch"
 __author_mail__ = "ronny.kreuch@fokus.fraunhofer.de"

setup-gevent-all.py

@@ -13,7 +13,7 @@ from utils import (get_packages, OpenMTCSdist, OpenMTCBuildPy,
 
 # name and version
 SETUP_NAME = "openmtc-all"
-SETUP_VERSION = "1.3.0"
+SETUP_VERSION = "1.2.0"
 SETUP_DESCRIPTION = "The OpenMTC Backend and Gateway (GEvent version)"
 
 # meta

setup-sdk.py

@@ -7,7 +7,7 @@ from utils import get_packages, OpenMTCSdist
 # name and version
 NAME = "sdk"
 SETUP_NAME = "openmtc-" + NAME
-SETUP_VERSION = "1.3.0"
+SETUP_VERSION = "1.2.0"
 SETUP_DESCRIPTION = "The OpenMTC Python SDK"
 
 # meta