Merge pull request #562 from eclipse-thingweb/ege-alignment

Alignment to Eclipse and New Web package
eclipse-thingweb · Feb 16, 2024 · 275eaf6 · 275eaf6
2 parents 27a4ffd + cb281df
commit 275eaf6
Show file tree

Hide file tree

Showing 37 changed files with 52 additions and 90 deletions.
diff --git a/.github/scripts/deploy-web.sh b/.github/scripts/deploy-web.sh
diff --git 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 }}
diff --git 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)
 [<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)

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
         }
    }
 }
diff --git 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
@@ -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
@@ -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
@@ -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" 
         }
     }
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
         }
     ],