From 46f229b4fba4ad3fb61803923e9bb04eca838179 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 16 Feb 2024 16:12:58 +0100 Subject: [PATCH 1/2] chore: fix repository alignment issues --- README.md | 4 ++-- .../basic-td-from-tm.td.jsonld | 2 +- .../composition-top-level-td-from-tm.td.jsonld | 6 +++--- .../extend-and-import-td-from-tm.td.jsonld | 2 +- .../extends-basic-td-from-tm.td.jsonld | 2 +- .../import-definition-td-from-tm.td.jsonld | 2 +- .../optional-interaction-td-from-tm.td.jsonld | 2 +- .../overwrite-definitions-td-from-tm.td.jsonld | 2 +- .../overwrite-optional-td-from-tm.td.jsonld | 2 +- .../placeholder-td-from-tm.td.jsonld | 2 +- .../relative-imports-td-from-tm.td.jsonld | 2 +- .../submodel-led-td-from-tm.td.jsonld | 4 ++-- .../submodel-ventilator-td-from-tm.td.jsonld | 4 ++-- .../versioning-td-from-tm.td.jsonld | 2 +- .../extend-and-import.tm.jsonld | 6 +++--- .../3-tm-extends-imports/extends-basic.tm.jsonld | 2 +- .../import-existing-definition.tm.jsonld | 2 +- .../overwrite-existing-definitions.tm.jsonld | 2 +- .../overwrite-optional-interactions.tm.jsonld | 4 ++-- examples/tm/5-tm-submodel/submodel.tm.jsonld | 4 ++-- packages/assertions/README.md | 2 +- packages/assertions/example-scripts/simple.js | 2 +- packages/cli/README.md | 2 +- packages/core/README.md | 2 +- packages/core/examples/scripts/simple-tm-usage.js | 2 +- packages/core/examples/tds/invalid/usingTM.json | 2 +- packages/core/examples/tds/valid/fromTM.json | 2 +- .../core/examples/tds/valid/usingRecursiveTM.json | 2 +- packages/core/examples/tds/valid/usingTM.json | 2 +- .../tds/warning/unavailableRecursiveTm.json | 2 +- packages/core/examples/tms/valid/extend.json | 2 +- packages/core/shared.js | 6 +++--- packages/defaults/README.md | 2 +- packages/json-spell-checker/README.md | 2 +- packages/web/README.md | 15 +++++++-------- 35 files changed, 52 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index c432f5f95..8e884be41 100644 --- a/README.md +++ b/README.md @@ -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) [npm](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) diff --git a/examples/td/16-td-tm-relationships/basic-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/basic-td-from-tm.td.jsonld index 50ba2f8a8..a88f730ad 100644 --- a/examples/td/16-td-tm-relationships/basic-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/basic-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld index 031e84db6..b48ebeeaa 100644 --- a/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/extend-and-import-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/extend-and-import-td-from-tm.td.jsonld index 8fbcb8dbc..c8f5348cb 100644 --- a/examples/td/16-td-tm-relationships/extend-and-import-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/extend-and-import-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/extends-basic-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/extends-basic-td-from-tm.td.jsonld index 5a3c46d72..a5c2227b6 100644 --- a/examples/td/16-td-tm-relationships/extends-basic-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/extends-basic-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/import-definition-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/import-definition-td-from-tm.td.jsonld index 0b7829b11..b309653d6 100644 --- a/examples/td/16-td-tm-relationships/import-definition-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/import-definition-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/optional-interaction-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/optional-interaction-td-from-tm.td.jsonld index 190fa06ec..4557fbd7e 100644 --- a/examples/td/16-td-tm-relationships/optional-interaction-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/optional-interaction-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/overwrite-definitions-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/overwrite-definitions-td-from-tm.td.jsonld index a38e15a94..5c8cc66d5 100644 --- a/examples/td/16-td-tm-relationships/overwrite-definitions-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/overwrite-definitions-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/overwrite-optional-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/overwrite-optional-td-from-tm.td.jsonld index 1d785f891..7f9ca0cdd 100644 --- a/examples/td/16-td-tm-relationships/overwrite-optional-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/overwrite-optional-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/placeholder-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/placeholder-td-from-tm.td.jsonld index cde798f7c..be6d1faec 100644 --- a/examples/td/16-td-tm-relationships/placeholder-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/placeholder-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/relative-imports-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/relative-imports-td-from-tm.td.jsonld index 04b3805f6..c225f0af3 100644 --- a/examples/td/16-td-tm-relationships/relative-imports-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/relative-imports-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld index 2d69c23d7..c4855a016 100644 --- a/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld index f6c8c40a9..3b59621bd 100644 --- a/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/td/16-td-tm-relationships/versioning-td-from-tm.td.jsonld b/examples/td/16-td-tm-relationships/versioning-td-from-tm.td.jsonld index 29d187cc1..bd5afb97a 100644 --- a/examples/td/16-td-tm-relationships/versioning-td-from-tm.td.jsonld +++ b/examples/td/16-td-tm-relationships/versioning-td-from-tm.td.jsonld @@ -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" } ], diff --git a/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld b/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld index fa2537988..eaceb90f8 100644 --- a/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld +++ b/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld @@ -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" } } } \ No newline at end of file diff --git a/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld b/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld index 0e10e8f87..7ca0ccb96 100644 --- a/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld +++ b/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld @@ -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" : { diff --git a/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld b/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld index d78b70883..c6ceeec82 100644 --- a/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld +++ b/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld @@ -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": { diff --git a/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld b/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld index 0a7057825..77fd52b4d 100644 --- a/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld +++ b/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld @@ -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": "%" diff --git a/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld b/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld index b4341f4d0..8dc98e49c 100644 --- a/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld +++ b/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld @@ -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" } } } \ No newline at end of file diff --git a/examples/tm/5-tm-submodel/submodel.tm.jsonld b/examples/tm/5-tm-submodel/submodel.tm.jsonld index a78886530..819c9605c 100644 --- a/examples/tm/5-tm-submodel/submodel.tm.jsonld +++ b/examples/tm/5-tm-submodel/submodel.tm.jsonld @@ -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" } diff --git a/packages/assertions/README.md b/packages/assertions/README.md index 6be81b327..d8bf85e99 100644 --- a/packages/assertions/README.md +++ b/packages/assertions/README.md @@ -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/#). diff --git a/packages/assertions/example-scripts/simple.js b/packages/assertions/example-scripts/simple.js index d63f2fecd..b2e6f24f9 100644 --- a/packages/assertions/example-scripts/simple.js +++ b/packages/assertions/example-scripts/simple.js @@ -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", }, ], diff --git a/packages/cli/README.md b/packages/cli/README.md index 2e955ae38..1af0c6caf 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -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. diff --git a/packages/core/README.md b/packages/core/README.md index c70a34ece..332be5859 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -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: diff --git a/packages/core/examples/scripts/simple-tm-usage.js b/packages/core/examples/scripts/simple-tm-usage.js index 7964c9950..0b180461e 100644 --- a/packages/core/examples/scripts/simple-tm-usage.js +++ b/packages/core/examples/scripts/simple-tm-usage.js @@ -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", }, ], diff --git a/packages/core/examples/tds/invalid/usingTM.json b/packages/core/examples/tds/invalid/usingTM.json index 5a9feadef..f1ff81738 100644 --- a/packages/core/examples/tds/invalid/usingTM.json +++ b/packages/core/examples/tds/invalid/usingTM.json @@ -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" } ], diff --git a/packages/core/examples/tds/valid/fromTM.json b/packages/core/examples/tds/valid/fromTM.json index 6a47db71e..1400ed3db 100644 --- a/packages/core/examples/tds/valid/fromTM.json +++ b/packages/core/examples/tds/valid/fromTM.json @@ -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" } ], diff --git a/packages/core/examples/tds/valid/usingRecursiveTM.json b/packages/core/examples/tds/valid/usingRecursiveTM.json index 5878e815f..01f3d2dc4 100644 --- a/packages/core/examples/tds/valid/usingRecursiveTM.json +++ b/packages/core/examples/tds/valid/usingRecursiveTM.json @@ -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" } ], diff --git a/packages/core/examples/tds/valid/usingTM.json b/packages/core/examples/tds/valid/usingTM.json index e427c5d23..d2bedd1bf 100644 --- a/packages/core/examples/tds/valid/usingTM.json +++ b/packages/core/examples/tds/valid/usingTM.json @@ -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" } ], diff --git a/packages/core/examples/tds/warning/unavailableRecursiveTm.json b/packages/core/examples/tds/warning/unavailableRecursiveTm.json index 89a457ea9..fbbedec35 100644 --- a/packages/core/examples/tds/warning/unavailableRecursiveTm.json +++ b/packages/core/examples/tds/warning/unavailableRecursiveTm.json @@ -11,7 +11,7 @@ "links": [ { "rel": "type", - "href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/invalid/unavailableParent.json", + "href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/invalid/unavailableParent.json", "type": "application/tm+json" } ], diff --git a/packages/core/examples/tms/valid/extend.json b/packages/core/examples/tms/valid/extend.json index 4fcf29b58..be2200deb 100644 --- a/packages/core/examples/tms/valid/extend.json +++ b/packages/core/examples/tms/valid/extend.json @@ -8,7 +8,7 @@ "links": [ { "rel": "tm:extends", - "href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/packages/core/examples/tms/valid/version.json", + "href": "https://raw.githubusercontent.com/eclipse-thingweb/playground/master/packages/core/examples/tms/valid/version.json", "type": "application/td+json" } ], diff --git a/packages/core/shared.js b/packages/core/shared.js index bf137c63a..6f460afae 100644 --- a/packages/core/shared.js +++ b/packages/core/shared.js @@ -820,7 +820,7 @@ function checkUriSecurity(td) { } // otherwise not-impl stays } else { // even if there are no urivariables in affordances, the security urivariables is distinct - // fixes https://github.com/thingweb/thingweb-playground/issues/422 + // fixes https://github.com/eclipse-thingweb/playground/issues/422 if (uriVariablesDistinctResult !== "fail") { uriVariablesDistinctResult = "pass"; } @@ -869,7 +869,7 @@ function checkUriSecurity(td) { } } else { // even if there are no urivariables in affordances, the security urivariables is distinct - // fixes https://github.com/thingweb/thingweb-playground/issues/422 + // fixes https://github.com/eclipse-thingweb/playground/issues/422 if (uriVariablesDistinctResult !== "fail") { uriVariablesDistinctResult = "pass"; } @@ -919,7 +919,7 @@ function checkUriSecurity(td) { } } else { // even if there are no urivariables in affordances, the security urivariables is distinct - // fixes https://github.com/thingweb/thingweb-playground/issues/422 + // fixes https://github.com/eclipse-thingweb/playground/issues/422 if (uriVariablesDistinctResult !== "fail") { uriVariablesDistinctResult = "pass"; } diff --git a/packages/defaults/README.md b/packages/defaults/README.md index af7b3cc6d..ac683b11b 100644 --- a/packages/defaults/README.md +++ b/packages/defaults/README.md @@ -2,7 +2,7 @@ The package adds/removes defaults according to the Thing Description (TD) specification for every property with a default that is not filled with a value. Currently using [this](https://www.w3.org/TR/2020/REC-wot-thing-description-20200409/) version of the TD specification. -It is part of the Thingweb-Playground, you can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground). +It is part of the Playground, you can find more information about the Playground [here](https://github.com/eclipse-thingweb/playground). ## License diff --git a/packages/json-spell-checker/README.md b/packages/json-spell-checker/README.md index 096b8e993..59064daa5 100644 --- a/packages/json-spell-checker/README.md +++ b/packages/json-spell-checker/README.md @@ -1,7 +1,7 @@ # @thing-description-playground/**JSON-SPELL-CHECKER** This package provides spell-checking support for JSON files when a JSON Schema is given. -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: diff --git a/packages/web/README.md b/packages/web/README.md index bd2d9ed2c..2f013b349 100644 --- a/packages/web/README.md +++ b/packages/web/README.md @@ -1,16 +1,15 @@ # @thing-description-playground/**WEB** -This package provides the web interface of the Web of Things Thing Desciption Playground. +This package provides the web interface of the Web of Things Thing Description Playground. It uses the functionality of the `core` package to validate Thing Descriptions and `assertions` to generate an assertion Test report. -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). The TDs can be exported as URLs which can be copied anywhere and reopened here. ## License Licensed under the MIT license, see [License](../../LICENSE.md). - -## Browser based Thing Description Validation +Browser-based Thing Description Validation - Online: It is hosted [here](http://plugfest.thingweb.io/playground/) @@ -81,13 +80,13 @@ Requires [Lerna](https://www.npmjs.com/package/lerna) to be installed globally ( 6. Clean the checked out files ```sh -git clone git@github.com:thingweb/thingweb-playground.git -cd thingweb-playground +git clone git@github.com:eclipse-thingweb/playground.git +cd playground lerna bootstrap -cd ./packages/playground-web +cd ./packages/web npm install rm -r -f /var/www/html/subdir/* cp -r ./* /var/www/html cd ../../../ -rm -r -f thingweb-playground +rm -r -f playground ``` From cb281dfbabf63cef3c44bf3269134a6547553911 Mon Sep 17 00:00:00 2001 From: Ege Korkan Date: Fri, 16 Feb 2024 16:18:23 +0100 Subject: [PATCH 2/2] chore: remove auto deploy scripts --- .github/scripts/deploy-web.sh | 19 ------------------- .github/workflows/ci-cd.yaml | 18 ------------------ 2 files changed, 37 deletions(-) delete mode 100755 .github/scripts/deploy-web.sh diff --git a/.github/scripts/deploy-web.sh b/.github/scripts/deploy-web.sh deleted file mode 100755 index 0b321a2e3..000000000 --- a/.github/scripts/deploy-web.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0 which is available at -# http://www.eclipse.org/legal/epl-2.0, or the W3C Software Notice and -# Document License (2015-05-13) which is available at -# https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document. -# -# SPDX-License-Identifier: EPL-2.0 OR W3C-20150513 -# - -TMP_PASS_FILE="$(mktemp)" -echo "$SSH_PASS" > $TMP_PASS_FILE -ssh -i $TMP_PASS_FILE -o StrictHostKeyChecking=no -o LogLevel=error $SSH_HOST "rm -r -f thingweb-playground; git clone https://github.com/eclipse-thingweb/playground.git; cd playground; lerna bootstrap; cd ./packages/web; rm -r -f /var/www/html/playground/*; cp -L -r ./* /var/www/html/playground; echo cleaned and copy to webdir; echo CD DONE" diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml index 625c364e2..e63fd4d7f 100644 --- a/.github/workflows/ci-cd.yaml +++ b/.github/workflows/ci-cd.yaml @@ -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 }}