Preparation for the drivetrain case study.

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/bundle.oml

@@ -1,9 +1,9 @@
 description bundle <http://ua.com.be/sdo2l/description/bundle#> as ^bundle {
 	uses <http://ua.com.be/sdo2l/vocabulary/bundle#>
-	includes <http://ua.com.be/sdo2l/description/definitions#>
-	includes <http://ua.com.be/sdo2l/description/requirements#>
-	includes <http://ua.com.be/sdo2l/description/structuralModels#>
-	includes <http://ua.com.be/sdo2l/description/systems#>
-	includes <http://ua.com.be/sdo2l/description/traces#>
-    includes <http://ua.com.be/sdo2l/description/workflows#>
+	includes <http://ua.com.be/sdo2l/description/simple_car/definitions#>
+	includes <http://ua.com.be/sdo2l/description/simple_car/requirements#>
+	includes <http://ua.com.be/sdo2l/description/simple_car/structuralModels#>
+	includes <http://ua.com.be/sdo2l/description/simple_car/systems#>
+	includes <http://ua.com.be/sdo2l/description/simple_car/traces#>
+    includes <http://ua.com.be/sdo2l/description/simple_car/workflows#>
 }

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/definitions.oml

@@ -1,4 +1,4 @@
-description <http://ua.com.be/sdo2l/description/definitions#> as definitions {
+description <http://ua.com.be/sdo2l/description/simple_car/definitions#> as definitions {
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 
 	ci requirementList-def : base:ArtifactType [

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/requirements.oml

@@ -1,7 +1,7 @@
-description <http://ua.com.be/sdo2l/description/requirements#> as requirements {
+description <http://ua.com.be/sdo2l/description/simple_car/requirements#> as requirements {
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	uses <http://ua.com.be/sdo2l/vocabulary/requirement#> as req
-	extends <http://ua.com.be/sdo2l/description/systems#> as systems
+	extends <http://ua.com.be/sdo2l/description/simple_car/systems#> as systems
 
 	uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/structuralModels.oml

@@ -1,4 +1,4 @@
-description <http://ua.com.be/sdo2l/description/structuralModels#> as components {
+description <http://ua.com.be/sdo2l/description/simple_car/structuralModels#> as components {
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	uses <http://www.w3.org/2001/XMLSchema#> as xsd
 	uses <http://ua.com.be/sdo2l/vocabulary/component#> as comp
@@ -36,7 +36,7 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	ci wheel1-massAttribute : comp:Attribute [
 		base:hasIdentifier "w1-mass"
 		base:hasCanonicalName "w1-mass att"
-		vim4:hasDoubleNumber "2"^^xsd:double
+		vim4:hasDoubleNumber "1.85"^^xsd:double
 		vim4:characterizes wheel1-component
 		vim4:unit iso-80000-4.1:kilogram
 	]
@@ -49,7 +49,7 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	ci wheel2-massAttribute : comp:Attribute [
 		base:hasIdentifier "w2-mass"
 		base:hasCanonicalName "w2-mass att"
-		vim4:hasDoubleNumber "2.0"^^xsd:double
+		vim4:hasDoubleNumber "2.15"^^xsd:double
 		vim4:characterizes wheel2-component
 		vim4:unit iso-80000-4.1:kilogram
 	]

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/systems.oml

@@ -1,4 +1,4 @@
-description <http://ua.com.be/sdo2l/description/systems#> as systems {
+description <http://ua.com.be/sdo2l/description/simple_car/systems#> as systems {
 	
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	uses <http://ua.com.be/sdo2l/vocabulary/system#> as system

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/traces.oml

@@ -1,11 +1,11 @@
-description <http://ua.com.be/sdo2l/description/traces#> as traces {
+description <http://ua.com.be/sdo2l/description/simple_car/traces#> as traces {
 	uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	uses <http://ua.com.be/sdo2l/vocabulary/shaclproperty#> as sp
 	uses <http://ua.com.be/sdo2l/vocabulary/violation#> as violation
-	extends <http://ua.com.be/sdo2l/description/workflows#> as wf
-	extends <http://ua.com.be/sdo2l/description/requirements#> as requirements
-	extends <http://ua.com.be/sdo2l/description/structuralModels#> as components
+	extends <http://ua.com.be/sdo2l/description/simple_car/workflows#> as wf
+	extends <http://ua.com.be/sdo2l/description/simple_car/requirements#> as requirements
+	extends <http://ua.com.be/sdo2l/description/simple_car/structuralModels#> as components
 
 	// Traces
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/workflows.oml

@@ -1,8 +1,8 @@
-description <http://ua.com.be/sdo2l/description/workflows#> as workflows {
+description <http://ua.com.be/sdo2l/description/simple_car/workflows#> as workflows {
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	//uses <http://www.w3.org/2001/XMLSchema#> as xsd
 	uses <http://ua.com.be/sdo2l/vocabulary/workflow#> as wf
-	extends <http://ua.com.be/sdo2l/description/definitions#> as defs
+	extends <http://ua.com.be/sdo2l/description/simple_car/definitions#> as defs
 
 
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/code.oml

@@ -1,9 +1,9 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/code#> as code {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/code#> as code {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
-    extends <http://ontology.rys.one/drivetrain/vocabulary/text#> as text
+    extends <http://ua.com.be/sdo2l/vocabulary/base/text#> as text
 
 
     concept CodeData :> text:TextData

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/file.oml

@@ -1,10 +1,11 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/file#> as file {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/file#> as file {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
+    extends <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
 
     aspect Data
-    aspect File [key isLocatedAt]
+    aspect File :> traces:Artifact [key isLocatedAt] 
 
     scalar property isLocatedAt [
         domain File

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/ftg.oml

@@ -1,4 +1,4 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/ftg#> as ftg {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/ftg#> as ftg {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/richtext.oml

@@ -1,9 +1,9 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/richtext#> as richtext {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/richtext#> as richtext {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
-    extends <http://ontology.rys.one/drivetrain/vocabulary/text#> as text
+    extends <http://ua.com.be/sdo2l/vocabulary/base/text#> as text
 
 
     concept RichTextData :> text:TextData

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/script.oml

@@ -1,10 +1,10 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/script#> as script {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/script#> as script {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
-    extends <http://ontology.rys.one/drivetrain/vocabulary/code#> as code
-    extends <http://ontology.rys.one/drivetrain/vocabulary/file#> as file
+    extends <http://ua.com.be/sdo2l/vocabulary/base/code#> as code
+    extends <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 
     concept ScriptData :> code:CodeData
     concept ScriptParameter :> file:Data

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/tabular.oml

@@ -1,9 +1,9 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/tabular#> as tabular {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/tabular#> as tabular {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
-    extends <http://ontology.rys.one/drivetrain/vocabulary/file#> as file
+    extends <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 
 
     aspect Collection

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/base/text.oml

@@ -1,9 +1,9 @@
-vocabulary <http://ontology.rys.one/drivetrain/vocabulary/text#> as text {
+vocabulary <http://ua.com.be/sdo2l/vocabulary/base/text#> as text {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
     extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
-    extends <http://ontology.rys.one/drivetrain/vocabulary/file#> as file
+    extends <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 
 
     concept TextData :> file:Data, file:File

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/bundle.oml

@@ -7,4 +7,11 @@ vocabulary bundle <http://ua.com.be/sdo2l/vocabulary/bundle#> as ^bundle {
 	includes <http://ua.com.be/sdo2l/vocabulary/workflow#>
 	includes <http://ua.com.be/sdo2l/vocabulary/shaclproperty#>
 	includes <http://ua.com.be/sdo2l/vocabulary/violation#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/code#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/file#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/ftg#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/richtext#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/script#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/tabular#>
+	includes <http://ua.com.be/sdo2l/vocabulary/base/text#>
 }