Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alignment to Eclipse and New Web package #562

Merged
merged 2 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions .github/scripts/deploy-web.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/ci-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,3 @@ jobs:

- name: TM test
run: node packages/cli/index.js -t TM -i examples/tm/*/*.jsonld

deploy-via-ssh:
runs-on: ubuntu-latest

needs: setup-and-test

if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' && github.repository_owner == 'thingweb' }}

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Run remote commands script
run: ./.github/scripts/deploy-web.sh
shell: bash
env:
SSH_PASS: ${{ secrets.SSH_PASS }}
SSH_HOST: ${{ secrets.SSH_HOST }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

The place where you can create and play with WoT Thing Descriptions. Try it online at [https://playground.thingweb.io/](https://playground.thingweb.io)

[![Default CI & CD Pipeline](https://github.com/thingweb/thingweb-playground/actions/workflows/ci-cd.yaml/badge.svg)](https://github.com/thingweb/thingweb-playground/actions/workflows/ci-cd.yaml)
[![CodeQL](https://github.com/thingweb/thingweb-playground/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/thingweb/thingweb-playground/actions/workflows/codeql-analysis.yml)
[![Default CI & CD Pipeline](https://github.com/eclipse-thingweb/playground/actions/workflows/ci-cd.yaml/badge.svg)](https://github.com/eclipse-thingweb/playground/actions/workflows/ci-cd.yaml)
[![CodeQL](https://github.com/eclipse-thingweb/playground/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/eclipse-thingweb/playground/actions/workflows/codeql-analysis.yml)
[![Discord](https://img.shields.io/badge/Discord-7289DA?logo=discord&logoColor=white&label=td-playground)](https://discord.gg/9yaFmkJ9GT)
[<img alt="npm" src="https://img.shields.io/npm/dw/@thing-description-playground/core">](https://npm-stat.com/charts.html?package=%2540thing-description-playground%252Fcore)
[![Netlify Status](https://api.netlify.com/api/v1/badges/51a65a70-cb51-49e1-bbb6-82e83983c6cf/deploy-status)](https://app.netlify.com/sites/thingweb-playground/deploys)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/1-basic/basic-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/1-basic/basic-tm.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
"links": [
{
"rel": "item",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld",
"type": "application/td+json"
},
{
"rel": "item",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld",
"type": "application/td+json"
},
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/submodel.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/5-tm-submodel/submodel.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/6-placeholder/placeholder.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/6-placeholder/placeholder.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/relative-imports.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/relative-imports.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"links": [
{
"rel": "collection",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld",
"type": "application/td+json"
},
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/basic-led-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/5-tm-submodel/basic-led-tm.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"links": [
{
"rel": "collection",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld",
"type": "application/td+json"
},
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/basic-ventilation-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/5-tm-submodel/basic-ventilation-tm.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/master/tm/2-tm-versioning/versioning.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/UI-fixes/master/tm/2-tm-versioning/versioning.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
"$description": "The tm:extends and the import mechanism based on tm:ref can also be used at the same time in a TM definition. This example extends the a basic TM with an On/Off property and imports the status and dim definitions from pther TMs respectively.",
"links" : [{
"rel": "tm:extends",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/1-basic/basic-on-off-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/1-basic/basic-on-off-tm.tm.jsonld",
"type": "application/tm+json"
}],
"properties" : {
"status" : {
"tm:ref": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/1-basic/basic-tm.tm.jsonld#/properties/status"
"tm:ref": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/1-basic/basic-tm.tm.jsonld#/properties/status"
},
"dimming" : {
"tm:ref": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld#/properties/dim"
"tm:ref": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld#/properties/dim"
}
}
}
2 changes: 1 addition & 1 deletion examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"$description": "A Thing Model can extend an existing Thing Model by using the tm:extends mechanism. When a Thing Model extends another Thing Model, at least one links entry with 'rel: tm:extends' that targets a Thing Model that is be extended must be used.",
"links" : [{
"rel": "tm:extends",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/1-basic/basic-on-off-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/1-basic/basic-on-off-tm.tm.jsonld",
"type": "application/tm+json"
}],
"properties" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"$description": "For importing pieces of definitions of one or more existing Thiing Models, the 'tm:ref' term is utilized which provides the location of an existing (sub-)definition that should be reused. This example shows a TM definition that imports the existing definition of the property onOff from another TM into the new property definition switch.",
"properties" : {
"switch" : {
"tm:ref": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/1-basic/basic-on-off-tm.tm.jsonld#/properties/onOff"
"tm:ref": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/1-basic/basic-on-off-tm.tm.jsonld#/properties/onOff"
}
},
"actions": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"$description": "At the place the 'tm:ref' is defined, additional name-value pairs can be added. It is also permitted to override name-value pairs from the referenced definition. If the intention is to override an existing JSON name-value pair definition from tm:ref, the same JSON name MUST be used at the same level of the tm:ref declaration that provides a new value. This example shows a new TM definition that overwrites (maximum), enhances (unit), and removes (title) existing definitions.",
"properties" : {
"dimming" : {
"tm:ref": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld#/properties/dim",
"tm:ref": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld#/properties/dim",
"title": "",
"maximum": 80,
"unit": "%"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"links": [
{
"rel": "tm:extends",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld",
"type": "application/tm+json"
}
],
"events": {
"overheating": {
"tm:ref": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld#/events/overheating"
"tm:ref": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld#/events/overheating"
}
}
}
4 changes: 2 additions & 2 deletions examples/tm/5-tm-submodel/submodel.tm.jsonld
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
"links": [
{
"rel": "tm:submodel",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/basic-ventilation-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/5-tm-submodel/basic-ventilation-tm.tm.jsonld",
"type": "application/tm+json",
"instanceName": "ventilation"
},
{
"rel": "tm:submodel",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/basic-led-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/examples/tm/5-tm-submodel/basic-led-tm.tm.jsonld",
"type": "application/tm+json",
"instanceName": "led"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/assertions/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @thing-description-playground/**ASSERTIONS**

This package provides the assertion testing functionality for the Web of Things Playground.
You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
You can find more information about the Playground [here](https://github.com/eclipse-thingweb/playground).

Validation tool for W3C WoT Thing Descriptions. Your Thing Descriptions should be written according to the W3C standard found [here](https://w3c.github.io/wot-thing-description/#).

Expand Down
2 changes: 1 addition & 1 deletion packages/assertions/example-scripts/simple.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const simpleTDusingTM = JSON.stringify({
links: [
{
rel: "type",
href: "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/optional.json",
href: "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/optional.json",
type: "application/td+json",
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @thing-description-playground/**CLI**

This package provides a Command Line Interface (CLI) for the Web of Things Playground.
You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
You can find more information about the Playground [here](https://github.com/eclipse-thingweb/playground).

You can validate whether one, or several given TDs are valid.
Furthermore you can generate an assertion test report (`-a`) to see which assertions are implemented in your TD.
Expand Down
2 changes: 1 addition & 1 deletion packages/core/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @thing-description-playground/**CORE**

This package provides the main functionality of the Web of Things Playground, i.e., validating given Thing Descriptions.
You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
You can find more information about the Playground [here](https://github.com/eclipse-thingweb/playground).

Limitations:

Expand Down
2 changes: 1 addition & 1 deletion packages/core/examples/scripts/simple-tm-usage.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ const simpleTD = JSON.stringify({
links: [
{
rel: "type",
href: "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/optional.json",
href: "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/optional.json",
type: "application/td+json",
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/examples/tds/invalid/usingTM.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/optional.json",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/optional.json",
"type": "application/td+json"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/examples/tds/valid/fromTM.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/optional.json",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/optional.json",
"type": "application/td+json"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/examples/tds/valid/usingRecursiveTM.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/extend.json",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/extend.json",
"type": "application/td+json"
}
],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/examples/tds/valid/usingTM.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/optional.json",
"href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/optional.json",
"type": "application/td+json"
}
],
Expand Down
Loading
Loading