diff --git a/docs/4___common_content.adoc b/docs/4___common_content.adoc index 1286628..02f5172 100644 --- a/docs/4___common_content.adoc +++ b/docs/4___common_content.adoc @@ -508,14 +508,18 @@ This mandatory attribute specifies the MIME type of the meta data, which does no If no specific MIME type can be indicated, then the type `application/octet-stream` is to be used. |source a| Optional attribute indicating the source of the meta data as a URI (cf. RFC 3986). -For purposes of the resolution of relative URIs the base URI is the URI of the SSD, if the sourceBase attribute is not specified or is specified as `SSD`, and the URI of the containing model element (e.g. component) if the base attribute is specified as `component`. - -This allows the specification of meta data sources that reside inside the component (for example an FMU) through relative URIs. +The base URI for the resolution of relative URIs is determined by the sourceBase attribute. If the source attribute is missing, the meta data *MUST* be provided inline as contents of a Content element, which *MUST NOT* be present otherwise. |sourceBase a| Defines the base the source URI is resolved against: -If the attribute is missing or is specified as `SSD`, the source is resolved against the URI of the SSD, if the attribute is specified as `component` the URI is resolved against the (resolved) URI of the model element (e.g. component) source. + +If the attribute is missing or is specified as `file`, the source is resolved against the URI of the containing file. + +If the containing model element has a source attribute, the sourceBase attribute can be specified as `resource`. +In this case the URI is resolved against the (resolved) source URI of the containing model element. + +The last option allows the specification of meta data sources that reside inside a resource (for example an FMU) through relative URIs. |=== ===== Content @@ -559,13 +563,19 @@ This mandatory attribute specifies the MIME type of the signature, which does no If no specific MIME type can be indicated, then the type `application/octet-stream` is to be used. |source a| Optional attribute indicating the source of the signature as a URI (cf. RFC 3986). -For purposes of the resolution of relative URIs the base URI is the URI of the SSD, if the sourceBase attribute is not specified or is specified as `SSD`, the URI of the containing model element (e.g. component) if the base attribute is specified as `component`, or the URI of the meta data source if the sourceBase attribute is specified as `metaData`. - -This allows the specification of signature sources that reside inside the component (for example an FMU), or the meta data through relative URIs. +The base URI for the resolution of relative URIs is determined by the sourceBase attribute. If the source attribute is missing, the signature *MUST* be provided inline as contents of a Content element, which *MUST NOT* be present otherwise. |sourceBase a| Defines the base the source URI is resolved against: -If the attribute is missing or is specified as `SSD`, the source is resolved against the URI of the SSD, if the attribute is specified as `component` the URI is resolved against the (resolved) URI of the model element (e.g. component) source, or if the attribute is specified as `metaData` the URI is resolved against the (resolved) URI of the meta data source. -The value `metaData` is only valid if the Signature element is contained within a MetaData element. + +If the attribute is missing or is specified as `file`, the source is resolved against the URI of the containing file. + +If the containing model element has a source attribute, the sourceBase attribute can be specified as `resource`. +In this case the URI is resolved against the (resolved) source URI of the containing model element. + +If the Signature element is contained within a MetaData element, the sourceBase attribute can be specified as `metaData`. +In this case the URI is resolved against the (resolved) URI of the meta data source. + +The last two options allow the specification of signature sources that reside inside a resource (for example an FMU), or the meta data through relative URIs. |=== diff --git a/docs/5___ssd.adoc b/docs/5___ssd.adoc index fab9885..9982f9c 100644 --- a/docs/5___ssd.adoc +++ b/docs/5___ssd.adoc @@ -426,14 +426,17 @@ Therefore they take priority over any of the existing parameter bindings (for pa No further types are currently defined, but can of course be added at a later date, for pre-existing parameter file formats, like CDF, etc. |source a| Optional attribute indicating the source of the parameters as a URI (cf. RFC 3986). -For purposes of the resolution of relative URIs the base URI is the URI of the SSD, if the sourceBase attribute is not specified or is specified as SSD, and the URI of the referenced component if the base attribute is specified as component. - -This allows the specification of parameter sources that reside inside the component (for example an FMU) through relative URIs. +The base URI for the resolution of relative URIs is determined by the sourceBase attribute. If the source attribute is missing, the parameter set *MUST* be provided inline as contents of a ParameterValues element, which *MUST NOT* be present otherwise. +|sourceBase a| +Defines the base the source URI is resolved against: + +If the attribute is missing or is specified as `SSD`, the source is resolved against the URI of the containing file. + +If the attribute is specified as `component` the URI is resolved against the (resolved) source URI of the component. -|sourceBase |Defines the base the source URI is resolved against: -If the attribute is missing or is specified as SSD, the source is resolved against the URI of the SSD, if the attribute is specified as component the URI is resolved against the (resolved) URI of the component source. +The last option allows the specification of parameter sources that reside inside a resource (for example an FMU) through relative URIs. |prefix |Defines the optional prefix for name resolution and mapping purposes for this binding. If this attribute is empty or not supplied no prefix is used for name resolution and mapping, otherwise the specified prefix is prepended to all names in the parameter source prior to processing the normal name resolution or name mapping rules. This allows the user to apply a parameter set normally intended for a component (and thus containing bare parameter names) at a system level targeted to one element of the system by supplying the name of the element plus a dot as a prefix on the binding, thus causing all parameter names in the parameter set to be treated as if they were specified with proper hierarchical names. @@ -471,14 +474,17 @@ If no mapping is supplied, the parameter names of the parameter source are used No further types are currently defined, but can of course be added at a later date. |source a| Optional attribute indicating the source of the parameter mapping as a URI (cf. RFC 3986). -For purposes of the resolution of relative URIs the base URI is the URI of the SSD, if the sourceBase attribute is not specified or is specified as SSD, and the URI of the referenced component if the base attribute is specified as component. - -This allows the specification of parameter mapping sources that reside inside the component (for example an FMU) through relative URIs. +The base URI for the resolution of relative URIs is determined by the sourceBase attribute. If the source attribute is missing, the parameter mapping *MUST* be provided inline as contents of the ParameterMapping element, which *MUST* be empty otherwise. +|sourceBase a| +Defines the base the source URI is resolved against: + +If the attribute is missing or is specified as `SSD`, the source is resolved against the URI of the containing file. + +If the attribute is specified as `component` the URI is resolved against the (resolved) source URI of the component. -|sourceBase |Defines the base the source URI is resolved against: -If the attribute is missing or is specified as SSD, the source is resolved against the URI of the SSD, if the attribute is specified as component the URI is resolved against the (resolved) URI of the component source. +The last option allows the specification of parameter mapping sources that reside inside a resource (for example an FMU) through relative URIs. |=== The contents of the element *MUST* be empty if the source attribute is present. diff --git a/docs/images/SystemStructureCommon_MetaData.png b/docs/images/SystemStructureCommon_MetaData.png index 105d2a0..8426366 100644 Binary files a/docs/images/SystemStructureCommon_MetaData.png and b/docs/images/SystemStructureCommon_MetaData.png differ diff --git a/docs/images/SystemStructureCommon_Signature.png b/docs/images/SystemStructureCommon_Signature.png index 0f80113..208a771 100644 Binary files a/docs/images/SystemStructureCommon_Signature.png and b/docs/images/SystemStructureCommon_Signature.png differ diff --git a/schema/SystemStructureCommon.xsd b/schema/SystemStructureCommon.xsd index a0d6daf..e767f9e 100644 --- a/schema/SystemStructureCommon.xsd +++ b/schema/SystemStructureCommon.xsd @@ -311,38 +311,31 @@ This attribute indicates the source of the resource meta data as a - URI (cf. RFC 3986). For purposes of the resolution of relative URIs - the base URI is the URI of the STC, if the sourceBase attribute is - not specified or is specified as STC, and the URI of the referenced - resource if the sourceBase attribute is specified as resource. - - This allows the specification of meta data sources that reside - inside the resource (e.g. an FMU) through relative URIs. - - For meta data that are located alongside the STC, relative URIs - without scheme and authority can and should be used to specify the - meta data sources. For meta data that are packaged inside an SSP - that contains this STC, this is mandatory (in this way, the STC - URIs remain valid after unpacking the SSP into the filesystem). - - If the source attribute is missing, the meta data is provided - inline as contents of the Content element, which must not be - present otherwise. + URI (cf. RFC 3986). The base URI for the resolution of relative URIs + is determined by the sourceBase attribute. + + If the source attribute is missing, the meta data is provided inline + as contents of a Content element, which must not be present otherwise. - + Defines the base the source URI is resolved against: If the attribute - is missing or is specified as SSD, the source is resolved against the - URI of the SSD, if the attribute is specified as resource the URI is - resolved against the (resolved) URI of the resource source. + is missing or is specified as file, the source is resolved against the + URI of the containing file. If the containing model element has a + source attribute, the sourceBase attribute can be specified as resource. + In this case the URI is resolved against the (resolved) source URI of + the containing model element. + + The last option allows the specification of meta data sources that + reside inside a resource (for example an FMU) through relative URIs. - + @@ -397,40 +390,37 @@ This attribute indicates the source of the digital signature as a - URI (cf. RFC 3986). For purposes of the resolution of relative URIs - the base URI is the URI of the SSD, if the sourceBase attribute is - not specified or is specified as SSD, the URI of the containing model - element (e.g. component) if the sourceBase attribute is specified as - component, or the URI of the meta data source if the sourceBase - attribute is specified as metaData. - - This allows the specification of signature sources that reside - inside the component (for example an FMU), or the meta data - through relative URIs. - - If the source attribute is missing, the signature is provided - inline as contents of the Content element, which must not be - present otherwise. + URI (cf. RFC 3986). The base URI for the resolution of relative URIs + is determined by the sourceBase attribute. + + If the source attribute is missing, the signature must be provided + inline as contents of a Content element, which must not be present + otherwise. - + - Defines the base the source URI is resolved against: If the attribute - is missing or is specified as SSD, the source is resolved against the - URI of the SSD, if the attribute is specified as component the URI is - resolved against the (resolved) URI of the model element (e.g. - component) source, or if the attribute is specified as metaData the - URI is resolved against the (resolved) URI of the meta data source. - The value metaData is only valid if the Signature element is contained - within a MetaData element. + Defines the base the source URI is resolved against: If the attribute + is missing or is specified as file, the source is resolved against the + URI of the containing file. If the containing model element has a + source attribute, the sourceBase attribute can be specified as resource. + In this case the URI is resolved against the (resolved) source URI of + the containing model element. If the Signature element is contained + within a MetaData element, the sourceBase attribute can be specified as + metaData. In this case the URI is resolved against the (resolved) URI + of the meta data source. + + The last two options allow the specification of signature sources that + reside inside a resource (for example an FMU), or the meta data + through relative URIs. - - + + diff --git a/schema/SystemStructureDescription.xsd b/schema/SystemStructureDescription.xsd index 1f9ae4b..727b397 100644 --- a/schema/SystemStructureDescription.xsd +++ b/schema/SystemStructureDescription.xsd @@ -951,12 +951,8 @@ This attribute indicates the source of the parameter mapping as a URI - (cf. RFC 3986). For purposes of the resolution of relative URIs - the base URI is the URI of the SSD, if the sourcebase attribute - is not specified or is specified as SSD, and the URI of the - referenced component if the base attribute is specified as component. - This allows the specification of parameter mapping sources that reside - inside the component (e.g. an FMU) through relative URIs. + (cf. RFC 3986). The base URI for the resolution of relative URIs is + determined by the sourceBase attribute. If the source attribute is missing, the parameter mapping is provided inline as contents of the ParameterMapping element, which must be @@ -969,8 +965,10 @@ Defines the base the source URI is resolved against: If the attribute is missing or is specified as SSD, the source is resolved against the - URI of the SSD, if the attribute is specified as component the URI is - resolved against the (resolved) URI of the component source. + URI of the containing file. If the attribute is specified as component + the URI is resolved against the (resolved) source URI of the component. + The last option allows the specification of parameter sources that + reside inside a resource (for example an FMU) through relative URIs. @@ -1000,15 +998,8 @@ This attribute indicates the source of the parameters as a URI - (cf. RFC 3986). For purposes of the resolution of relative URIs - the base URI is the URI of the SSD, if the sourcebase attribute - is not specified or is specified as SSD, and the URI of the - referenced component if the base attribute is specified as component. - This allows the specification of parameter sources that reside inside - the component (e.g. an FMU) through relative URIs. - - Access to parameter sets over the SSP Parameter Repository Protocol - is mediated through URIs with the http or https scheme. + (cf. RFC 3986). The base URI for the resolution of relative URIs is + determined by the sourceBase attribute. If the source attribute is missing, the parameter mapping is provided inline as contents of a ParameterValues element, which must not be @@ -1021,8 +1012,11 @@ Defines the base the source URI is resolved against: If the attribute is missing or is specified as SSD, the source is resolved against the - URI of the SSD, if the attribute is specified as component the URI is - resolved against the (resolved) URI of the component source. + URI of the containing file. If the attribute is specified as component + the URI is resolved against the (resolved) source URI of the component. + The last option allows the specification of parameter mapping sources + that reside inside a resource (for example an FMU) through relative + URIs. diff --git a/schema/SystemStructureDescription11.xsd b/schema/SystemStructureDescription11.xsd index c1caba6..eb7fb62 100644 --- a/schema/SystemStructureDescription11.xsd +++ b/schema/SystemStructureDescription11.xsd @@ -898,12 +898,8 @@ This attribute indicates the source of the parameter mapping as a URI - (cf. RFC 3986). For purposes of the resolution of relative URIs - the base URI is the URI of the SSD, if the sourcebase attribute - is not specified or is specified as SSD, and the URI of the - referenced component if the base attribute is specified as component. - This allows the specification of parameter mapping sources that reside - inside the component (e.g. an FMU) through relative URIs. + (cf. RFC 3986). The base URI for the resolution of relative URIs is + determined by the sourceBase attribute. If the source attribute is missing, the parameter mapping is provided inline as contents of the ParameterMapping element, which must be @@ -916,8 +912,10 @@ Defines the base the source URI is resolved against: If the attribute is missing or is specified as SSD, the source is resolved against the - URI of the SSD, if the attribute is specified as component the URI is - resolved against the (resolved) URI of the component source. + URI of the containing file. If the attribute is specified as component + the URI is resolved against the (resolved) source URI of the component. + The last option allows the specification of parameter sources that + reside inside a resource (for example an FMU) through relative URIs. @@ -947,15 +945,8 @@ This attribute indicates the source of the parameters as a URI - (cf. RFC 3986). For purposes of the resolution of relative URIs - the base URI is the URI of the SSD, if the sourcebase attribute - is not specified or is specified as SSD, and the URI of the - referenced component if the base attribute is specified as component. - This allows the specification of parameter sources that reside inside - the component (e.g. an FMU) through relative URIs. - - Access to parameter sets over the SSP Parameter Repository Protocol - is mediated through URIs with the http or https scheme. + (cf. RFC 3986). The base URI for the resolution of relative URIs is + determined by the sourceBase attribute. If the source attribute is missing, the parameter mapping is provided inline as contents of a ParameterValues element, which must not be @@ -968,8 +959,11 @@ Defines the base the source URI is resolved against: If the attribute is missing or is specified as SSD, the source is resolved against the - URI of the SSD, if the attribute is specified as component the URI is - resolved against the (resolved) URI of the component source. + URI of the containing file. If the attribute is specified as component + the URI is resolved against the (resolved) source URI of the component. + The last option allows the specification of parameter mapping sources + that reside inside a resource (for example an FMU) through relative + URIs.