From aa093c0f528a648e5aa197ce90ead2bd72d4b9c9 Mon Sep 17 00:00:00 2001 From: GlassOfWhiskey Date: Fri, 21 Apr 2023 21:47:57 +0200 Subject: [PATCH] Substitute URI with IRI in docs --- Process.yml | 14 +++++++------- concepts.md | 2 -- invocation.md | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Process.yml b/Process.yml index de9d6613..41d24a2d 100644 --- a/Process.yml +++ b/Process.yml @@ -69,10 +69,10 @@ $graph: Files are represented as objects with `class` of `File`. File objects have a number of properties that provide metadata about the file. - The `location` property of a File is a URI that uniquely identifies the - file. Implementations must support the `file://` URI scheme and may support + The `location` property of a File is a IRI that uniquely identifies the + file. Implementations must support the `file://` IRI scheme and may support other schemes such as `http://` and `https://`. The value of `location` may also be a - relative reference, in which case it must be resolved relative to the URI + relative reference, in which case it must be resolved relative to the IRI of the document it appears in. Alternately to `location`, implementations must also accept the `path` property on File, which must be a filesystem path available on the same host as the CWL runner (for inputs) or the @@ -115,7 +115,7 @@ $graph: modified by `outputEval`. Alternately, if the file `cwl.output.json` is present in the output, `outputBinding` is ignored. - File objects in the output must provide either a `location` URI or a `path` + File objects in the output must provide either a `location` IRI or a `path` property in the context of the tool execution runtime (local to the compute node, or within the executing container). @@ -314,8 +314,8 @@ $graph: Directories are represented as objects with `class` of `Directory`. Directory objects have a number of properties that provide metadata about the directory. - The `location` property of a Directory is a URI that uniquely identifies - the directory. Implementations must support the file:// URI scheme and may + The `location` property of a Directory is a IRI that uniquely identifies + the directory. Implementations must support the file:// IRI scheme and may support other schemes such as http://. Alternately to `location`, implementations must also accept the `path` property on Directory, which must be a filesystem path available on the same host as the CWL runner (for @@ -344,7 +344,7 @@ $graph: first and have local values of `path` assigned. Directory objects in CommandLineTool output must provide either a - `location` URI or a `path` property in the context of the tool execution + `location` IRI or a `path` property in the context of the tool execution runtime (local to the compute node, or within the executing container). An ExpressionTool may forward file references from input to output by using diff --git a/concepts.md b/concepts.md index 6219c447..760751d1 100644 --- a/concepts.md +++ b/concepts.md @@ -8,8 +8,6 @@ **Avro**: https://avro.apache.org/docs/1.8.1/spec.html -**Uniform Resource Identifier (URI) Generic Syntax**: https://tools.ietf.org/html/rfc3986) - **Internationalized Resource Identifiers (IRIs)**: https://tools.ietf.org/html/rfc3987 diff --git a/invocation.md b/invocation.md index a50e3410..8f7e8d73 100644 --- a/invocation.md +++ b/invocation.md @@ -169,9 +169,9 @@ path within the output directory. It is an error for "path" to refer outside the output directory. Similarly, if a File or Directory "cwl.output.json" contains -`location`, it is resolved as relative reference URI with a base URI +`location`, it is resolved as relative reference IRI with a base IRI representing the output directory. If `location` contains some other -absolute URI with a scheme supported by the implementation, the +absolute IRI with a scheme supported by the implementation, the implementation may choose to accept it. If both `path` and `location` are provided on a File or Directory in