From 417dd4c14d9b7d40872b1949cd6daadd02343ed3 Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 15:54:06 +0200 Subject: [PATCH 1/9] Update UsagePolicyClass.ttl Fixed language literal syntax from `"..." @en` to `"..."@en` @HaydarAk could you please search and replace this globally? --- codes/UsagePolicyClass.ttl | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/codes/UsagePolicyClass.ttl b/codes/UsagePolicyClass.ttl index 233875f8..d80178bf 100644 --- a/codes/UsagePolicyClass.ttl +++ b/codes/UsagePolicyClass.ttl @@ -6,113 +6,113 @@ idsc:ALLOW_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Allow data usage" @en; - rdfs:comment "This policy restricts the usage of the data to a specific Data Consumer, regardless of how many connectors they have and without any further usage restriction." @en. + rdfs:label "Allow data usage"@en; + rdfs:comment "This policy restricts the usage of the data to a specific Data Consumer, regardless of how many connectors they have and without any further usage restriction."@en. idsc:CONNECTOR_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Connector restricted data usage" @en; + rdfs:label "Connector restricted data usage"@en; rdfs:comment "This policy restrict the usage of the data to a specific IDS connector."@en . idsc:APPLICATION_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "System restricted data usage" @en; - rdfs:comment "This policy restricts the usage of the data to a specific system or application inside an IDS connector." @en. + rdfs:label "System restricted data usage"@en; + rdfs:comment "This policy restricts the usage of the data to a specific system or application inside an IDS connector."@en. idsc:INTERVAL_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Interval restricted data usage" @en; - rdfs:comment "This policy restricts the usage of the data to a specific (time) interval." @en. + rdfs:label "Interval restricted data usage"@en; + rdfs:comment "This policy restricts the usage of the data to a specific (time) interval."@en. idsc:DURATION_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Duration restricted data usage" @en; - rdfs:comment "This policy restricts the usage of the data to a specific duration." @en. + rdfs:label "Duration restricted data usage"@en; + rdfs:comment "This policy restricts the usage of the data to a specific duration."@en. idsc:LOCATION_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Location restricted data usage" @en; - rdfs:comment "This policy restricts the usage of the data to a specific location, e.g. expressed via location areas, geographic points or geographic bounding polygons." @en. + rdfs:label "Location restricted data usage"@en; + rdfs:comment "This policy restricts the usage of the data to a specific location, e.g. expressed via location areas, geographic points or geographic bounding polygons."@en. idsc:PREPATUAL_DATA_SALE a ids:UsagePolicyClass ; - rdfs:label "Prepatual data sale" @en; - rdfs:comment "This policy restricts the transfer of a Data Asset against a one-off payment in a given currency" @en. + rdfs:label "Prepatual data sale"@en; + rdfs:comment "This policy restricts the transfer of a Data Asset against a one-off payment in a given currency"@en. idsc:DATA_RENTAL a ids:UsagePolicyClass ; - rdfs:label "Data rental" @en; + rdfs:label "Data rental"@en; rdfs:comment "This policy restricts transfer of data in return for a monthly fee. The ending is not specified. Nevertheless, the policy ends when a notice of termination has been made by any of the policy partners." @en. idsc:ROLE_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Role restricted data usage" @en; + rdfs:label "Role restricted data usage"@en; rdfs:comment """This policy restricts the usage of the data to a specific role. For example, you can instantiate a policy of this class that allows only the members of the engineering department to use your data. This policy class faces few limitations, i.e., in order to evaluate the conditions, it requires that the user roles are available and follow a common vocabulary""" @en. idsc:PURPOSE_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Purpose restricted data usage" @en; - rdfs:comment "This policy restricts the usage of data assets limited to specific purposes." @en. + rdfs:label "Purpose restricted data usage"@en; + rdfs:comment "This policy restricts the usage of data assets limited to specific purposes."@en. idsc:EVENT_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; - rdfs:label "Event restricted data usage" @en; + rdfs:label "Event restricted data usage"@en; rdfs:comment """This policy restricts the usage of data assets limited to specific events. The ODRL language defines an identified event as a context for exercising the action of the Rule. Events are temporal periods of time. A Data Provider may want to restrict the usage of the data to a specific event when the exact time and date of the event is not clear in advance. - Therefore, the event condition can be specified in a policy.""" @en. + Therefore, the event condition can be specified in a policy."""@en. idsc:RESTRICTED_NUMBER_OF_USAGES a ids:UsagePolicyClass ; - rdfs:label "Restricted number of usages" @en; + rdfs:label "Restricted number of usages"@en; rdfs:comment """This policy restricts the usage of data assets limited to numeric count of executions of actions. A mechanism is needed that counts the usage of data in order to enforce the policy."""@en . idsc:SECURITY_LEVEL_RESTRICTED_POLICY a ids:UsagePolicyClass ; - rdfs:label "Security level restricted policy" @en; + rdfs:label "Security level restricted policy"@en; rdfs:comment "This policy restricts the usage of data assets limited to a security level the consumer must conform to."@en. idsc:USE_DATA_AND_DELETE_AFTER a ids:UsagePolicyClass ; - rdfs:label "Use data and delete after" @en; - rdfs:comment "This policy restricts the usage of data assets with the obligation to delete the asset after usage." @en. + rdfs:label "Use data and delete after"@en; + rdfs:comment "This policy restricts the usage of data assets with the obligation to delete the asset after usage."@en. idsc:MODIFY_DATA_IN_TRANSIT a ids:UsagePolicyClass ; - rdfs:label "Modfy data in transit" @en; - rdfs:comment "This policy restricts the usage of data assets with the obligation to anonymize the data when it is leaving the Data Provider connector or when it is entering the Data Consumer connector" @en. + rdfs:label "Modfy data in transit"@en; + rdfs:comment "This policy restricts the usage of data assets with the obligation to anonymize the data when it is leaving the Data Provider connector or when it is entering the Data Consumer connector"@en. idsc:MODIFY_DATA_IN_REST a ids:UsagePolicyClass ; - rdfs:label "Modfy data in rest" @en; + rdfs:label "Modfy data in rest"@en; rdfs:comment """This policy restricts the usage of data assets with the obligation to anonymize the data before permission to use the data is granted. - In contrast to the idscMODIFY_DATA_IN_TRANSIT policy class, it demands the modifications to be done when data is stored.""" @en. + In contrast to the idscMODIFY_DATA_IN_TRANSIT policy class, it demands the modifications to be done when data is stored."""@en. idsc:LOCAL_LOGGING a ids:UsagePolicyClass ; - rdfs:label "Local logging" @en; - rdfs:comment "This policy restricts the usage of data assets with the obligation to log prior specified processes, such as the data access." @en. + rdfs:label "Local logging"@en; + rdfs:comment "This policy restricts the usage of data assets with the obligation to log prior specified processes, such as the data access."@en. idsc:REMOTE_NOTIFICATION a ids:UsagePolicyClass ; - rdfs:label "Remote notification" @en; - rdfs:comment "This policy restricts the usage of data assets with the obligation to notify a specific party about the data usage." @en. + rdfs:label "Remote notification"@en; + rdfs:comment "This policy restricts the usage of data assets with the obligation to notify a specific party about the data usage."@en. idsc:ATTACH_POLICY_FOR_THIRD_PARTY a ids:UsagePolicyClass ; - rdfs:label "Remote notification" @en; - rdfs:comment "This policy restricts the usage of data assets with the obligation to notify a specific party about the data usage." @en. + rdfs:label "Remote notification"@en; + rdfs:comment "This policy restricts the usage of data assets with the obligation to notify a specific party about the data usage."@en. idsc:DISTRIBUTE_ONLY_IF_ENCRYPTED a ids:UsagePolicyClass ; - rdfs:label "Distribute only if encrypted" @en; - rdfs:comment "This policy restricts the usage of data assets with the obligation to encrypt the data asset before distribution." @en. + rdfs:label "Distribute only if encrypted"@en; + rdfs:comment "This policy restricts the usage of data assets with the obligation to encrypt the data asset before distribution."@en. idsc:STATE_RESTRICTED_POLICY a ids:UsagePolicyClass ; - rdfs:label "State restricted policy" @en; - rdfs:comment "This policy restricts the usage of data assets limited to specific states. Possible states include, for example, that the contract for the given data asset has not yet expired." @en. + rdfs:label "State restricted policy"@en; + rdfs:comment "This policy restricts the usage of data assets limited to specific states. Possible states include, for example, that the contract for the given data asset has not yet expired."@en. From fe9a239ec1fb3ebf50353f1889f86edf8e4c063f Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 21:30:43 +0200 Subject: [PATCH 2/9] Minor language and syntax improvements --- codes/UsagePolicyClass.ttl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/codes/UsagePolicyClass.ttl b/codes/UsagePolicyClass.ttl index d80178bf..0b4514ab 100644 --- a/codes/UsagePolicyClass.ttl +++ b/codes/UsagePolicyClass.ttl @@ -17,7 +17,7 @@ idsc:CONNECTOR_RESTRICTED_DATA_USAGE idsc:APPLICATION_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; rdfs:label "System restricted data usage"@en; - rdfs:comment "This policy restricts the usage of the data to a specific system or application inside an IDS connector."@en. + rdfs:comment "This policy restricts the usage of the data to a specific system or application inside an IDS Connector."@en. idsc:INTERVAL_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; @@ -32,24 +32,24 @@ idsc:DURATION_RESTRICTED_DATA_USAGE idsc:LOCATION_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; rdfs:label "Location restricted data usage"@en; - rdfs:comment "This policy restricts the usage of the data to a specific location, e.g. expressed via location areas, geographic points or geographic bounding polygons."@en. + rdfs:comment "This policy restricts the usage of the data to a specific location, e.g., expressed via location areas, geographic points or geographic bounding polygons."@en. idsc:PREPATUAL_DATA_SALE a ids:UsagePolicyClass ; rdfs:label "Prepatual data sale"@en; - rdfs:comment "This policy restricts the transfer of a Data Asset against a one-off payment in a given currency"@en. + rdfs:comment "This policy restricts the transfer of a Data Asset against a one-off payment in a given currency."@en. idsc:DATA_RENTAL a ids:UsagePolicyClass ; rdfs:label "Data rental"@en; - rdfs:comment "This policy restricts transfer of data in return for a monthly fee. The ending is not specified. Nevertheless, the policy ends when a notice of termination has been made by any of the policy partners." @en. + rdfs:comment "This policy restricts transfer of data in return for a monthly fee. The ending is not specified. Nevertheless, the policy ends when a notice of termination has been made by any of the policy partners."@en. idsc:ROLE_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; rdfs:label "Role restricted data usage"@en; rdfs:comment """This policy restricts the usage of the data to a specific role. For example, you can instantiate a policy of this class that allows only the members of the engineering department to use your data. - This policy class faces few limitations, i.e., in order to evaluate the conditions, it requires that the user roles are available and follow a common vocabulary""" @en. + This policy class faces few limitations, i.e., in order to evaluate the conditions, it requires that the user roles are available and follow a common vocabulary"""@en. idsc:PURPOSE_RESTRICTED_DATA_USAGE a ids:UsagePolicyClass ; @@ -89,7 +89,7 @@ idsc:MODIFY_DATA_IN_REST a ids:UsagePolicyClass ; rdfs:label "Modfy data in rest"@en; rdfs:comment """This policy restricts the usage of data assets with the obligation to anonymize the data before permission to use the data is granted. - In contrast to the idscMODIFY_DATA_IN_TRANSIT policy class, it demands the modifications to be done when data is stored."""@en. + In contrast to the idsc:MODIFY_DATA_IN_TRANSIT policy class, it demands the modifications to be done when data is stored."""@en. idsc:LOCAL_LOGGING a ids:UsagePolicyClass ; From 7675414595911859dfff3f0691ab699a56a805a4 Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 21:32:45 +0200 Subject: [PATCH 3/9] fixed minor typos --- docs/config/widoco.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/config/widoco.py b/docs/config/widoco.py index 00a8c39b..5d123050 100644 --- a/docs/config/widoco.py +++ b/docs/config/widoco.py @@ -7,8 +7,8 @@ from datetime import datetime -# Get path to widoco executable jar file and jive credentials from -# command line or bamboo variabes. +# Get path to widoco executable jar file and Jive credentials from +# command line or Bamboo variabes. def parse_arguments(): if len(sys.argv) == 4: # Use command line arguments @@ -87,7 +87,7 @@ def replace_widoco_html_output(filename, text): # Remove trailing slahes from html and "id" values. # Slashes are inserted because ids namespace contains them. # They break local referencing inside html file. -# workaround until it's otherweise fixed. +# workaround until it's otherwise fixed. def remove_ids_trailingslash(filename): newHtml = '' From 61a3748351ecc445f9cdeb8ea08508dde6d95ae3 Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 22:05:59 +0200 Subject: [PATCH 4/9] minor spacing --- model/communication/AppRoute.ttl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/communication/AppRoute.ttl b/model/communication/AppRoute.ttl index c2356e19..c0cf3839 100644 --- a/model/communication/AppRoute.ttl +++ b/model/communication/AppRoute.ttl @@ -94,7 +94,7 @@ ids:appRouteClearingHouse a owl:ObjectProperty; rdfs:domain ids:AppRoute; rdfs:range ids:ClearingHouse; rdfs:label "app route broker"@en ; - rdfs:comment """One or more ids:ClearingHouse(s) to which information of this route's data exchange are notified. + rdfs:comment """One or more ids:ClearingHouse(s) to which information of this route's data exchange are notified. This should be a subset of clearing houses listed in the corresponding ids:ClearingHouseCatalog for a given configuration model. The Configuration Model ids:configuredClearingHouse in the ids:ConfigurationModel of which this is an ids:appRoute. """@en ; . @@ -107,4 +107,4 @@ ids:requiredDataApp a owl:ObjectProperty; whoose endpoint (ids:AppEndpoint) is used in this ids:RouteStep. The referred app representation should be part of the catalog of AppResources in the corresponding Configuration Model (cf. ids:configuredAppResource property in class ids:ConfigurationModel). """@en ; -. \ No newline at end of file +. From 25940c0f1a08b718ba55598b9e9e8c40b40b6f8b Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 22:09:04 +0200 Subject: [PATCH 5/9] minor punctuation --- model/content/DataApp.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/content/DataApp.ttl b/model/content/DataApp.ttl index 3644f59b..c58a66aa 100644 --- a/model/content/DataApp.ttl +++ b/model/content/DataApp.ttl @@ -38,7 +38,7 @@ ids:appEnvironmentVariables a owl:DatatypeProperty; ids:appStorageConfiguration a owl:DatatypeProperty; rdfs:label "app storage configuration"@en; - rdfs:comment "Storage configuration of a data app. Value may differ based on the app ecosystem, e.g. a writeable path in the file system or a volume name (e.g. for containerized apps)"@en ; + rdfs:comment "Storage configuration of a data app. Value may differ based on the app ecosystem, e.g., a writeable path in the file system or a volume name (e.g., for containerized apps)"@en ; rdfs:domain ids:DataApp; rdfs:range xsd:string; . From 5964125ad8ea32ca6b7da110238d027e0d23d687 Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 22:14:15 +0200 Subject: [PATCH 6/9] minor spacing --- model/contract/Rule.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/contract/Rule.ttl b/model/contract/Rule.ttl index 45a915e6..5991eec4 100644 --- a/model/contract/Rule.ttl +++ b/model/contract/Rule.ttl @@ -48,7 +48,7 @@ ids:action rdfs:domain [ rdf:type owl:Class ; owl:unionOf ( ids:Rule ids:UsageControlObject)] ; rdfs:range ids:Action; - rdfs:comment "The operation relating to the asset / data object. "@en. + rdfs:comment "The operation relating to the asset / data object. "@en. ids:assignee rdfs:subPropertyOf odrl:assignee; a owl:ObjectProperty; From d488fc31449900d0b459ea5467c07edfe2b1cb51 Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 22:22:07 +0200 Subject: [PATCH 7/9] minor linguistics --- model/infrastructure/Catalog.ttl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model/infrastructure/Catalog.ttl b/model/infrastructure/Catalog.ttl index a220e222..cd890546 100644 --- a/model/infrastructure/Catalog.ttl +++ b/model/infrastructure/Catalog.ttl @@ -21,7 +21,7 @@ ids:ResourceCatalog a owl:Class; rdfs:subClassOf ids:Catalog; rdfs:label "Resource Catalog"@en ; - rdfs:comment "Class that aggregates Resources form a (distributable) Catalog."@en ; + rdfs:comment "Class that aggregates Resources from a (distributable) Catalog."@en ; . ids:ParticipantCatalog @@ -64,7 +64,7 @@ ids:ClearingHouseCatalog rdfs:subClassOf ids:Catalog; a owl:Class; rdfs:label "Clearing House Catalog"@en ; - rdfs:comment "Class that aggregates AppStores from a (distributable) Catalog."@en ; + rdfs:comment "Class that aggregates Clearing Houses from a (distributable) Catalog."@en ; . @@ -83,7 +83,7 @@ ids:requestedResource a owl:ObjectProperty; rdfs:domain ids:ResourceCatalog; rdfs:range ids:Resource; rdfs:label "requested resource"@en; - rdfs:comment "A Resource that is part of a resource catalog, indicating a request (of, e.g., data, software,...)."@en. + rdfs:comment "A Resource that is part of a resource catalog, indicating a request (of, e.g., data, software, …)."@en. ids:member a owl:ObjectProperty; rdfs:subPropertyOf dcat:dataset; From c71277a7d428ce545a8278d0bb377ba75bbfd422 Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 22:34:34 +0200 Subject: [PATCH 8/9] minor spelling --- model/participant/Participant.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/participant/Participant.ttl b/model/participant/Participant.ttl index 47b10258..be8df6b4 100644 --- a/model/participant/Participant.ttl +++ b/model/participant/Participant.ttl @@ -101,7 +101,7 @@ ids:vatID a owl:DatatypeProperty ; rdfs:domain ids:Participant ; rdfs:range xsd:string ; - rdfs:label "vat ID"@en ; + rdfs:label "VAT ID"@en ; rdfs:comment "The Value Added Tax ID (VAT ID) is used in the EU to clearly identify a company or entity which is liable for Value Added Tax."@en ; . From 93f51afb25497f3ee565e91de15250ca2ed9b25d Mon Sep 17 00:00:00 2001 From: Christoph Lange Date: Thu, 10 Jun 2021 23:07:37 +0200 Subject: [PATCH 9/9] fixed typo --- utils/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/README.md b/utils/README.md index ade7e608..db4d2d13 100644 --- a/utils/README.md +++ b/utils/README.md @@ -12,7 +12,7 @@ - `grep -rh --include "*.ttl" "@prefix" | sed -E 's/@prefix\s+(\w*):.*/\1/' | sort | uniq` - List declared namespaces - `grep -rh --include "*.ttl" "@prefix" | sed -E 's/[^<]+<([^>]+)>.*/\1/' | sort | uniq` -- List resource QNames form the IDS namespace (i.e., ids, idsv, idsc etc.) +- List resource QNames forom the IDS namespace (i.e., ids, idsv, idsc etc.) - `grep -rEho --include "*.ttl" "ids(\w*):\w+" | sort | uniq` - Generate list of model files for import purposes within a static ontology file, considering the code lists (`codes`), concept definitions (`model, metamodel`) and concept taxonomies (`taxonomies`) except related 3rd party `references` (to be executed in $INFO_MODEL_ROOT). - `find . ! -path "*/references/*" -and \( -path "*/codes/**.ttl" -or -path "*/model/**.ttl" -or -path "*/metamodel/**.ttl" -or -path "*/taxonomies/**.ttl" \) | sort | sed -r 's/^\.\/(.*)/<\1>,/'`