diff --git a/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_ChangeLog.adoc b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_ChangeLog.adoc index d0a35a8bd..493c47842 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_ChangeLog.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/IDTA-01001_ChangeLog.adoc @@ -46,7 +46,7 @@ Major Changes: * New value "Role" to enumeration AssetKind (https://github.com/admin-shell-io/aas-specs/issues/294[#294]) -* PathType: support complete URI scheme for files RFC3986/RFC3987 (https://github.com/admin-shell-io/aas-specs/issues/299[#299]) +* Change PathType: support complete URI scheme for files RFC2396/RFC2732 (https://github.com/admin-shell-io/aas-specs/issues/299[#299]) * data type Identifier: change length from 2000 to 2024 characters (https://github.com/admin-shell-io/aas-specs/issues/306[#306]) * Referable/idShort and Constraint AASd-002: now also allows hyphens to be included in name (https://github.com/admin-shell-io/aas-specs/issues/295[#295]) * Entity/entityType and Constraint AASd-014: entityType now optional (https://github.com/admin-shell-io/aas-specs/issues/287[#287]) @@ -103,7 +103,7 @@ Bugfixes: | | Identifier a| data type: change length from 2000 to 2024 characters | | MultiLanguageNameType a| (bugfix in Text only) maxLength=128 (as derived and implemented) | | NameType a| implicit change due to change of Constraint AASd-002 -| | PathType a| extend data type to support complete URI scheme for files RFC3986/RFC3987 +| | PathType a| extend data type to support complete URI scheme for files RFC 2396/RFC 2732 | | Qualifier/Kind a| (bugfix in Text only) attribute starts with small letter | | Referable/idShort a| implicit change because constraint AASd-002 now also allows hyphen |=== diff --git a/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_DataTypes.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_DataTypes.adoc index f4258e660..81373e002 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_DataTypes.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_DataTypes.adoc @@ -12,9 +12,10 @@ SPDX-License-Identifier: CC-BY-4.0 == Predefined Simple Data Types -The metamodel of the Asset Administration Shell uses basic data types as defined in the link:https://www.w3.org/XML/Core/[XML Schema Definition] (XSD)footnote:[https://www.w3.org/XML/Core/, former https://www.w3.org/XML/Schema]. See Table 7 for an overview of the used types. Their definition is outside the scope of this document. +The metamodel of the Asset Administration Shell uses some of the predefined simple data types of the link:https://www.w3.org/XML/Core/[XML Schema Definition] (XSD) +as its basic data types footnote:[https://www.w3.org/XML/Core/, former https://www.w3.org/TR/xmlschema-2/#built-in-datatypes]. See Table 7 for an overview of the used types. Their definition is outside the scope of this document. -The meaning and format of xsd types is specified in https://www.w3.org/XML/Schema. The simple type "langString" is specified in the Resource Description Framework (RDF)footnote:[see: https://www.w3.org/TR/rdf11-concepts/]. +The meaning and format of xsd types is specified in https://www.w3.org/XML/Schema. The simple type "langString" is specified in the Resource Description Framework (RDF) footnote:[see: https://www.w3.org/TR/rdf11-concepts/]. See Clause 5.3.12.6 for constraints on types. @@ -22,14 +23,30 @@ See Clause 5.3.12.6 for constraints on types. [cols="10%,19%,38%,33%",options="header",] |=== |Source |Basic Data Type |Value Range |Sample Values -|xsd |string |Character string (but not all Unicode character strings) |"Hello world", "Καλημέρα κόσμε", + + +|xsd |https://www.w3.org/TR/xmlschema2/#string[string] |Character string (but not all Unicode character strings) |"Hello world", "Καλημέρα κόσμε", + "ハローワールド"" -|xsd |base64Binary |base64-encoded binary data |"a3Vtb3dhc2hlcmU=" -|xsd |boolean |true, false |true, false -|xsd |dateType |Date and time with or without time zone |"2000-01-01T14:23:00", + + +|xsd |https://www.w3.org/TR/xmlschema2/#base64Binary[base64Binary] |base64-encoded binary data |"a3Vtb3dhc2hlcmU=" + +|xsd |https://www.w3.org/TR/xmlschema2/#boolean[boolean] |true, false |true, false + +|xsd |https://www.w3.org/TR/xmlschema2/#anyURI[anyUri] | "[anyURI supports a] wide range of internationalized resource identifiers can be specified when an anyURI is called for, and still be understood as URIs per https://www.w3.org/TR/xmlschema11-2/#RFC3986[RFC 3986] and its successor(s)." + +It can be absolute or relative, and may have an optional fragment identifier a| {blank}./Specification.pdf + +file:c:/local/Specification.pdf + +\http://www.example.org + +FTP://unicode.org + +|xsd |https://www.w3.org/TR/xmlschema2/#dateType[dateType] |Date and time with or without time zone |"2000-01-01T14:23:00", + "2000-01-01T14:23:00.66372+14:00"footnote:[Corresponds to xs:dateTimeStamp in XML Schema 1.1] -|xsd |duration |Duration of time |"-P1Y2M3DT1H", + + +|xsd |https://www.w3.org/TR/xmlschema2/#duration[duration] |Duration of time |"-P1Y2M3DT1H", + "PT1H5M0S" + |rdf |langString |Strings with language tags a| "Hello"@en, + "Hallo"@de @@ -174,18 +191,25 @@ Each string within langString has a max of 1,023 and min of 1 characters. .2+e|[[NameType]]NameType 2+| `\https://admin-shell.io/aas/3/0/NameType` a|_string_ with max 128 and min 1 characters |"ManufacturerPartId" + + .2+e|[[PathType]]PathType 2+| `\https://admin-shell.io/aas/3/1/PathType` a| -_Identifier_ + +_anyURI_ + +with max 2024 and min 1 characters ==== -Note: URL, based on [RFC-3986](https://www.rfc-editor.org/rfc/rfc3987) /[RFC-3987](https://www.rfc-editor.org/rfc/rfc3987), but more recently defined as living standard by WHATWG, as suggested by W3C: https://url.spec.whatwg.org/ +"[anyURI supports a] wide range of internationalized resource identifiers can be specified when an anyURI is called for, and still be understood as URIs per https://www.w3.org/TR/xmlschema11-2/#RFC3986[RFC 3986] and its successor(s)." + +Source: https://www.w3.org/TR/xmlschema11-2/#anyURI[W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes] ==== a| -./Specification.pdf +{blank}./Specification.pdf file:c:/local/Specification.pdf @@ -197,7 +221,6 @@ FTP://unicode.org .2+e|[[RevisionType]]RevisionType 2+| `\https://admin-shell.io/aas/3/0/RevisionType` a| _string_ with max 4 and min 1 characters - following the following regular expression: ^([0-9]\|[1-9][0-9]*)$ diff --git a/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_SubmodelElements.adoc b/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_SubmodelElements.adoc index 901297d57..b7633a96a 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_SubmodelElements.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/Spec/IDTA-01001_Metamodel_SubmodelElements.adoc @@ -659,6 +659,8 @@ For more information on references, see Clause 5.3.9. == Relationship Element Attributes +The semantics of the relationship is defined via the _semanticId_ of the _RelationshipElement_. If this semantic definition requires additional information not contained in the _first_ or _second_ object referenced via the relationship, the submodel element type xref:AnnotatedRelationsshipElement[AnnotatedRelationshipElement] shall be used instead. + .Metamodel of Relationship Elements image::image43.png[]