rename puml for overview of UML packages

reorder and correct overview to be consistent with chapter structure
admin-shell-io · Dec 1, 2024 · ae291cc · ae291cc
1 parent 4099380
commit ae291cc
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 68 deletions.
diff --git a/documentation/IDTA-01001/modules/ROOT/pages/spec-metamodel/overview.adoc b/documentation/IDTA-01001/modules/ROOT/pages/spec-metamodel/overview.adoc
@@ -83,16 +83,18 @@ Data specification templates are selected at design time.
 The UML packages reflect the structure of Clause xref:spec-metamodel/designators.adoc[].
 The elements of package "Core" are specified as first class citizens in Clause xref:spec-metamodel/core.adoc[Core Classes], except for their imported packages: the elements of package "SubmodelElements" are specified in Clause xref:spec-metamodel/submodel-elements.adoc[].
 Elements of package "Common" are specified in Clause xref:spec-metamodel/common.adoc[].
-The elements of package "Reference" are specified in Clause xref:spec-metamodel/referencing.adoc[].
+The elements of package "Referencing" are specified in Clause xref:spec-metamodel/referencing.adoc[].
 Elements from package "Types" are specified in Clause xref:spec-metamodel/datatypes.adoc[].
+Elements from package "Envirnonment" are specified in Clause xref:spec-metamodel/environment.adoc[].
+Elements from package "ConceptDescriptions" are specified in Clause xref:spec-metamodel/concept-descriptions.adoc[].
 The only package that is not listed is "Data Specifications (Templates)" because data specifications are handled differently.
 Data specification templates are explained in Clause xref:data-specifications.adoc[].
 
 .Metamodel Package Overview
 [[image-metamodel-package-overview]]
-[plantuml, 13-structure, svg]
+[plantuml, overview-package-structure, svg]
 ....
-include::partial$diagrams/13-structure.puml[]
+include::partial$diagrams/overview-package-structure.puml[]
 ....
 
 

diff --git a/.../ROOT/partials/diagrams/13-structure.puml → .../diagrams/overview-package-structure.puml b/.../ROOT/partials/diagrams/13-structure.puml → .../diagrams/overview-package-structure.puml
@@ -3,7 +3,7 @@
 
 left to right direction
 
-package Details_of_the_Asset_Administration_Shell_Part_1 [
+package AAS_Metamodel [
   <&folder> + Common
   <&folder> + Core
   <&folder> + Referencing
@@ -15,41 +15,80 @@ package Details_of_the_Asset_Administration_Shell_Part_1 [
 
 package Common [
   + AdministrativeInformation
-  + Extension
+  + HasDataSpecification
   + HasExtensions
-  + Referable
-  + Identifiable
   + HasKind
   + HasSemantics
+  + Identifiable
   + Qualifiable
-  + HasDataSpecification
+  + Referable
   <&folder> + CommonEntities
 ]
 package CommonEntities [
+  + Extension
   + Qualifier
 ]
 
 package Core [
   + AssetAdministrationShell
   + AssetInformation
-  + SpecificAssetId
   + Submodel
   + SubmodelElement
   <&folder> + SubmodelElements
+  <&folder> + CoreEntities
 ]
-package Referencing [
-  + Key
-  + Reference
-  + KeyTypes
-  + ReferenceTypes
-  <&folder> + ReferencingEnumerations
+package CoreEntities [
+  + AssetKind
+  + ModellingKind
+  + QualifierKind
+  + SpecificAssetId
 ]
-package Environment [
-  + Environment
+
+package SubmodelElements [
+  + AnnotatedRelationshipElement
+  + BasicEventElement
+  + Blob
+  + Capability
+  + DataElement
+  + Entity
+  + EventElement
+  + File
+  + MultiLanguageProperty
+  + Operation
+  + Property
+  + Range
+  + ReferenceElement
+  + RelationshipElement
+  + SubmodelElementCollection
+  + SubmodelElementList
+  <&folder> + SubmodelElementEntities
 ]
+
+package SubmodelElementEntities [
+  + EntityType
+  + EventPayload
+  + OperationVariable
+  + Direction
+  + StateOfEvent
+]
+
 package ConceptDescriptions [
   + ConceptDescription
 ]
+
+package Environment [
+  + Environment
+]
+
+package Referencing [
+  + Key
+  + Reference
+
+  <&folder> + ReferencingEnumerations
+  <&folder> + ReferencingLogicalEnumerations
+]
+
+
 package Types [
   <&folder> + CommonMetamodelTypes
   <&folder> + BasicAndPrimitiveTypes
@@ -62,10 +101,10 @@ package CommonMetamodelTypes [
 ]
 
 package SimpleTypes [
-  + Base64Binary
-  + duration
+  + base64Binary
   + boolean
   + dateTime
+  + duration
   + string
 ]
 
@@ -74,23 +113,23 @@ package ExtendedTypes [
 ]
 
 package BasicAndPrimitiveTypes [
-  + MessageTopicType
+  + BlobType
   + ContentType
+  + Identifier
   + KeyType
-  + RangeType
-  + Resource
   + LabelType
+  + LangStringSet
+  + MessageTopicType
   + MultiLanguageNameType
   + MultiLanguageTextType
   + NameType
-  + RevisionType
-  + VersionType
-  + BlobType
-  + Identifier
-  + LangStringSet
   + PathType
   + QualifierType
+  + RangeType
+  + Resource
+  + RevisionType
   + ValueDataType
+  + VersionType
   <&folder> + DataTypeDefXsdEnumeration
   <&folder> + DataTypeDefRdfEnumeration
   <&folder> + Enumerations
@@ -104,42 +143,13 @@ package DataTypeDefXsdEnumeration [
   + DataTypeDefXsd
 ]
 
-package Enumerations [
-  + AssetKind
-  + EntityType
-  + ModellingKind
-  + QualifierKind
-]
-
-package SubmodelElements [
-  + AnnotatedRelationshipElement
-  + BasicEventElement
-  + Blob
-  + Capability
-  + DataElement
-  + Entity
-  + EventElement
-  + File
-  + MultiLanguageProperty
-  + Operation
-  + Property
-  + Range
-  + ReferenceElement
-  + RelationshipElement
-  + SubmodelElementCollection
-  + SubmodelElementList
-  <&folder> + SubmodelElementEntities
-]
-
-package SubmodelElementEntities [
-  + EventPayload
-  + OperationVariable
-  + Direction
-  + StateOfEvent
-]
 
 package ReferencingEnumerations [
   + KeyTypes
+  + ReferenceTypes
+]
+
+package ReferencingLogicalEnumerations [
   + AasIdentifiables
   + AasReferableNonIdentifiables
   + AasReferables
@@ -151,27 +161,29 @@ package ReferencingEnumerations [
 ]
 
 ' Relationships
-Details_of_the_Asset_Administration_Shell_Part_1 ..> Common : <import>
+AAS_Metamodel ..> Common : <import>
 Common ..> CommonEntities : <import>
 
-Details_of_the_Asset_Administration_Shell_Part_1 ..> Core : <import>
-Core ..> SubmodelElements : <import>
+AAS_Metamodel ..> Core : <import>
+Core ..> CoreEntities : <import>
+
+AAS_Metamodel ..> SubmodelElements : <import>
 SubmodelElements ..> SubmodelElementEntities : <import>
 
-Details_of_the_Asset_Administration_Shell_Part_1 ..> Referencing : <import>
+AAS_Metamodel ..> Referencing : <import>
 Referencing ..> ReferencingEnumerations : <import>
+Referencing ..> ReferencingLogicalEnumerations : <import>
 
-Details_of_the_Asset_Administration_Shell_Part_1 ..> Environment : <import>
+AAS_Metamodel ..> Environment : <import>
 
-Details_of_the_Asset_Administration_Shell_Part_1 ..> Types : <import>
+AAS_Metamodel ..> Types : <import>
 Types ..> CommonMetamodelTypes : <import>
 CommonMetamodelTypes ..> SimpleTypes: <import>
 CommonMetamodelTypes ..> ExtendedTypes: <import>
 Types ..> BasicAndPrimitiveTypes : <import>
 BasicAndPrimitiveTypes ..> DataTypeDefRdfEnumeration : <import>
 BasicAndPrimitiveTypes ..> DataTypeDefXsdEnumeration : <import>
-BasicAndPrimitiveTypes ..> Enumerations : <import>
 
-Details_of_the_Asset_Administration_Shell_Part_1 ..> ConceptDescriptions : <import>
+AAS_Metamodel ..> ConceptDescriptions : <import>
 
 @enduml