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.

Sign up for GitHub

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

Jump to bottom

td/tm fixes, changed links to the master examples #463

Merged
merged 2 commits into from
Apr 14, 2023
Merged

td/tm fixes, changed links to the master examples #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
497a2d3
td/tm fixes, changed links to the master examples
SergioCasCeb Apr 13, 2023
bc74010
Merge branch 'master' of https://github.com/thingweb/thingweb-playgro…
SergioCasCeb Apr 14, 2023
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
10 changes: 5 additions & 5 deletions examples/td/16-td-tm-relationships/basic-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
],
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Lamp Thing Model",
"$title": "Basic Thing Model Example",
"description": "TM for a lamp thing",
"$description": "This is an example of a basic Thing Model, which is use as a sort of template for creating a Thing Description instance of a Lamp TD",
"title": "Lamp Thing",
"$title": "Basic Thing Example",
"description": "Lamp thing example",
"$description": "This is an example of a basic Thing, which is use as a sort of template for creating a Thing Description instance of a Lamp TD",
"securityDefinitions": {
"basic_sc": {
"scheme": "basic",
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/1-basic/basic-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/1-basic/basic-tm.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
12 changes: 6 additions & 6 deletions examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"@context": "https://www.w3.org/2022/wot/td/v1.1",
"title": "Smart Ventilator Thing Model",
"$title": "Top level/parent Thing Model Example",
"description": "Top level/parent Smart Ventilator Thing Model ",
"title": "Smart Ventilator Thing",
"$title": "Top level/parent Thing Example",
"description": "Top level/parent Smart Ventilator Thing",
"$description": "If it is desired to provide information that a Thing Model consists of one or more (sub-)TMs, the links entries must use the 'rel': 'tm:submodel' that targets to the (sub-)TM. Optionally an instanceName may be provided to associate an individual name to the composed (sub-)TM. This is useful when multiple similar Thing Model definitions are composed and needs to be distinguished.",
"version": {
"instance": "1.0.0",
Expand All @@ -18,17 +18,17 @@
"links": [
{
"rel": "item",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/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/UI-fixes/examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/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/UI-fixes/examples/tm/5-tm-submodel/submodel.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/submodel.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/extend-and-import-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Smart Lamp Control",
"$title": "Smart Lamp Control TM with Extend and Import",
"description": "TM for a lamp thing controller",
"$title": "Smart Lamp Control with Extend and Import",
"description": "Lamp thing controller",
"$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.",
"securityDefinitions": {
"basic_sc": {
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/extend-and-import.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/extends-basic-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Smart Lamp Control with Dimming",
"$title": "Extend Thing Model Example",
"description": "TM for controlling a Lamp thing with dimming fuctions",
"$title": "Extend Thing Example",
"description": "Thing for controlling a Lamp thing with dimming fuctions",
"$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",
"securityDefinitions": {
"basic_sc": {
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/extends-basic.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/import-definition-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Smart Lamp Control",
"$title": "Import Existing Definitions TM Example",
"description": "TM for a lamp thing controller",
"$title": "Import Existing Definitions Thing Example",
"description": "Thing for a lamp thing controller",
"$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.",
"securityDefinitions": {
"basic_sc": {
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/import-existing-definition.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/optional-interaction-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
],
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Lamp Thing Model",
"title": "Lamp Thing",
"$title": "Optinal Interaction Affordances Example",
"description": "TM for a lamp thing",
"description": "Thing for a lamp",
"$description": "In some cases it is desirable to not enforce which interaction affordances are mandatory and do not necessarily need to be implemented in a Thing Description instance. If interaction models are not mandatory to be implemented in a Thing Description instance, Thing Model definitions MUST use the JSON member name tm:optional.",
"securityDefinitions": {
"basic_sc": {
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/4-tm-optional/optional-interaction.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/4-tm-optional/optional-interaction.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/overwrite-definitions-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Smart Lamp Control",
"$title": "Overwrite Existing Definitions TM Example",
"description": "TM for a lamp thing controller",
"$title": "Overwrite Existing Definitions Example",
"description": "Thing for a lamp thing controller",
"$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",
"securityDefinitions": {
"basic_sc": {
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/overwrite-existing-definitions.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/overwrite-optional-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
],
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Lamp Thing Model (All Mandatory)",
"title": "Lamp Thing (All Mandatory)",
"$title": "Overwriting Optinal Interaction Affordances Example",
"description": "Lamp Thing Model description wich expects all interaction affordances (status, toggle, and overheating)",
"description": "Lamp Thing description wich expects all interaction affordances (status, toggle, and overheating)",
"$description": "An optional definition in a Thing Model definition can be overwritten in the case it is extended by another Thing Model through the use of tm:ref. This examples overwrites the 'tm:optional' of another TM with an optional 'overheating' event",
"securityDefinitions": {
"basic_sc": {
Expand All @@ -18,7 +18,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/4-tm-optional/overwrite-optional-interactions.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
6 changes: 3 additions & 3 deletions examples/td/16-td-tm-relationships/placeholder-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "thermostat No. 4",
"$title": "Placeholder TM Example",
"description": "A TM for a thermostat with placeholder labeling",
"$title": "Placeholder Thing Example",
"description": "A Thing for a thermostat with placeholder labeling",
"$description": "In a case where TD instance terms, but not their values, are known in advance, the placeholder labeling may be used in a Thing Model. The string-based pattern of the placeholder must follow a valid pattern based on the regular expression {{2}[ -~]+}{2} (e.g., {{PLACEHOLDER_IDENTIFIER}}). The characters between {{ and }} are used as identifier name of the placeholder.",
"version": {
"instance": "1.0.1",
Expand All @@ -23,7 +23,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/6-placeholder/placeholder.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/6-placeholder/placeholder.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
8 changes: 4 additions & 4 deletions examples/td/16-td-tm-relationships/relative-imports-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"@type": "Thing",
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Multi Sensor",
"$title": "Relative Imports TM Example",
"description": "TM for a multisensor thing",
"$description": "This Thing Model example re-uses and augments a 'genericTemperature' property in two more specific properties, which describe an inner and an outer temperature value, respectively.",
"$title": "Relative Imports Thing Example",
"description": "Thing for a multisensor",
"$description": "This Thing example re-uses and augments a 'genericTemperature' property in two more specific properties, which describe an inner and an outer temperature value, respectively.",
"securityDefinitions": {
"basic_sc": {
"scheme": "basic",
Expand All @@ -16,7 +16,7 @@
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/3-tm-extends-imports/relative-imports.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/3-tm-extends-imports/relative-imports.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
10 changes: 5 additions & 5 deletions examples/td/16-td-tm-relationships/submodel-led-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"@context": "https://www.w3.org/2022/wot/td/v1.1",
"title": "LED Thing Model",
"$title": "Basic LED Thing Model Example",
"description": "Thing Model for a simple LED Thing",
"title": "LED Thing",
"$title": "Basic LED Thing Example",
"description": "Thing for a simple LED",
"$description": "This is an example of a simple Thing Model which is utilized as a submodel of another Thing Model",
"version": {
"instance": "1.0.0",
Expand All @@ -18,12 +18,12 @@
"links": [
{
"rel": "collection",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/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/UI-fixes/examples/tm/5-tm-submodel/basic-led-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/basic-led-tm.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
10 changes: 5 additions & 5 deletions examples/td/16-td-tm-relationships/submodel-ventilator-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"@context": "https://www.w3.org/2022/wot/td/v1.1",
"title": "Ventilator Thing Model",
"$title": "Basic Ventilator Thing Model Example",
"description": "Thing Model for a simple Ventilator Thing",
"title": "Ventilator Thing",
"$title": "Basic Ventilator Thing Example",
"description": "Thing for a simple Ventilator",
"$description": "This is an example of a simple Thing Model which is utilized as a submodel of another Thing Model",
"version": {
"instance": "1.0.0",
Expand All @@ -18,12 +18,12 @@
"links": [
{
"rel": "collection",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/td/16-td-tm-relationships/composition-top-level-td-from-tm.td.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/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/UI-fixes/examples/tm/5-tm-submodel/basic-ventilation-tm.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/master/examples/tm/5-tm-submodel/basic-ventilation-tm.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
10 changes: 5 additions & 5 deletions examples/td/16-td-tm-relationships/versioning-td-from-tm.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"https://www.w3.org/2022/wot/td/v1.1"
],
"id": "urn:uuid:0804d572-cce8-422a-bb7c-4412fcd56f06",
"title": "Lamp Thing Model",
"$title": "Versioning Thing Model Example",
"description": "TM for a lamp thing",
"$description": "When the Thing Model definitions change over time, this should be reflected in the version container. The term model is used with the version container in order to provide such versioning information.",
"title": "Lamp Thing",
"$title": "Versioning Thing Example",
"description": "Lamp thing example",
"$description": "When the Thing definitions change over time, this should be reflected in the version container. The term model is used with the version container in order to provide such versioning information.",
"version": {
"instance": "1.0.0",
"model": "1.0.0"
},
"links": [
{
"rel": "type",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/examples/tm/2-tm-versioning/versioning.tm.jsonld",
"href": "https://raw.githubusercontent.com/thingweb/thingweb-playground/UI-fixes/master/tm/2-tm-versioning/versioning.tm.jsonld",
"type": "application/tm+json"
}
],
Expand Down
3 changes: 1 addition & 2 deletions examples/td/5-protocols/CoAP-block-wise-no-parameters.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
},
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll"
"href": "coap://mylamp.example.com/oh"
}
]
}
Expand Down
3 changes: 1 addition & 2 deletions examples/td/5-protocols/CoAP-block-wise-parameters.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
},
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll"
"href": "coap://mylamp.example.com/oh"
}
]
}
Expand Down
3 changes: 1 addition & 2 deletions examples/td/5-protocols/CoAP-content-negotiation.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@
},
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll"
"href": "coap://mylamp.example.com/oh"
}
]
}
Expand Down
3 changes: 1 addition & 2 deletions examples/td/5-protocols/CoAP-hop-limit.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
},
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll"
"href": "coap://mylamp.example.com/oh"
}
]
}
Expand Down
3 changes: 1 addition & 2 deletions examples/td/5-protocols/CoAP-observing-resources.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
},
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll"
"href": "coap://mylamp.example.com/oh"
}
]
}
Expand Down
1 change: 0 additions & 1 deletion examples/td/5-protocols/CoAP-simple-td-defaults.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll",
"op": [
"subscribeevent",
"unsubscribeevent"
Expand Down
3 changes: 1 addition & 2 deletions examples/td/5-protocols/CoAP-simple-td-no-defaults.td.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
},
"forms": [
{
"href": "coap://mylamp.example.com/oh",
"subprotocol": "longpoll"
"href": "coap://mylamp.example.com/oh"
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions examples/tm/1-basic/basic-on-off-tm.tm.jsonld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"@context": ["https://www.w3.org/2022/wot/td/v1.1"],
"@type": "tm:ThingModel",
"title": "Basic On/Off Thing Model",
"$title": "Basic Thing Model Example for an On and Off Thing Description",
"$description": "This is an example of a simple Thing Model which is utilized to extend onto another Thing Model",
"title": "Basic On/Off Thing",
"$title": "Basic Thing Example for an On and Off Thing Description",
"$description": "This is an example of a simple Thing which is utilized to extend onto another Thing",
"properties": {
"onOff": {
"type": "boolean"
Expand Down
Loading