Merge branch 'master' into ST6RI-766

Author: seidewitz

README.adoc

@@ -44,30 +44,34 @@ image:oomph-projects.png[oomph projects]
 
 ==== Manual installation
 
-1. Install Eclipse 2025-03 (4.35) and Xtext.
+1. Install Eclipse 2025-03 (4.35).
    * Install the “Eclipse Modeling Tools” package.
      ** `https://www.eclipse.org/downloads/packages/release/2025-03/r/eclipse-modeling-tools`
 
-   * To install Xtext, select Help > Install New Software, use the update site URL given below, and install “Xtext Complete SDK” (under General Purpose Tools).
-     ** `http://download.eclipse.org/releases/2025-03`
+   * Install additional release packages in Eclipse.
+     ** Select Help > Install New Software.
+     ** Enter the update site URL `http://download.eclipse.org/releases/2025-03`.
+     ** Install “Xtext Complete SDK” (under General Purpose Tools) and "QVT Operational SDK" (under Modeling).
 
-   * (Optional) For PlantUML visualization, you need to install PlantUML-Eclipse with SysMLv2 extensions from
-     the update site of `https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates` with Help > Install New Software.
+   * (Optional) For PlantUML visualization, install PlantUML-Eclipse with SysMLv2 extensions.
+     ** Select Help > Install New Software
+     ** Enter the update site URL `https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates`.
+     ** Install "PlantUML Eclipse support".
 
-2. Clone our GitHub repository from the URL below.
+2. Clone the GitHub repository from the URL below.
    * `https://github.com/Systems-Modeling/SySML-v2-Pilot-Implementation.git`
 
 3. Import projects from the repository into your Eclipse workspace. This should include at least the projects:
    * `org.omg.sysml`
    * `org.omg.kerml.expressions.xtext`
    * `org.omg.kerml.expressions.xtext.ide`
    * `org.omg.kerml.expressions.xtext.ui`
-   * `org.kerml.xtext`
-   * `org.kerml.xtext.ide`
-   * `org.kerml.xtext.ui`
-   * `org.sysml.xtext`
-   * `org.sysml.xtext.ide`
-   * `org.sysml.xtext.ui`
+   * `org.omg.kerml.xtext`
+   * `org.omg.kerml.xtext.ide`
+   * `org.omg.kerml.xtext.ui`
+   * `org.omg.sysml.xtext`
+   * `org.omg.sysml.xtext.ide`
+   * `org.omg.sysml.xtext.ui`
 
 4. https://maven.apache.org/[Maven] is used to perform a coordinated build of all projects (including packaging the SysML Interactive JAR file that is used by `org.omg.sysml.jupyter`). 
         * To build the repository, invoke `mvn clean package` from the base `SysML-v2-Pilot-Implementation` directory.

kerml/src/examples/Simple Tests/Redefinition.kerml

@@ -1,15 +1,23 @@
 package Redefinition {
-	class Occurrence;
-	class Transfer {
-		feature transferSource;
-		feature item;
-		assoc SourceOutputLink specializes Objects::BinaryLinkObject {
-			end [1] feature source: Occurrence;
-			end [1..*] feature target: Occurrence;
-		}
-		connector sourceOutputLink: SourceOutputLink[1..*] from transferSource to item {
-			feature startShot: Occurrence redefines SourceOutputLink::startShot;
-			feature endShot: Occurrence redefines SourceOutputLink::endShot;
-		}
+	
+	classifier A {
+	    feature f;
+	}
+	
+	classifier B specializes A {
+	    feature redefines f {
+	        feature g;
+	    }
+	}
+	
+	classifier C specializes A, B {
+	    feature subsets f {
+	        feature redefines g;
+	    }
+	}
+
+	class X {
+		feature redefines startShot;
+		feature redefines endShot;
 	}
 }

org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: SysML v2 Submission Team
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.expressions.xtext,

org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: SysML v2 Submission Team
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.expressions.xtext,

org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext
 Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,

org.omg.kerml.owl.ide/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.owl.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: My Company
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.owl,

org.omg.kerml.owl.ui/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.kerml.owl.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: My Company
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.omg.kerml.owl,

org.omg.kerml.owl/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.omg.sysml.owl
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: My Company
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,

org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: org.omg.kerml.xpect.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true
 Bundle-Vendor: SysML v2 Submission Team
-Bundle-Version: 0.51.0.qualifier
+Bundle-Version: 0.52.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)",
  org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)",

org.omg.kerml.xpect.tests/library/Transfers.kerml

@@ -177,7 +177,7 @@ standard library package Transfers {
         end feature target: Occurrence redefines Transfer::target, TransferBefore::target;         
     }
 
-    abstract flow transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
+    abstract step transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
         doc
         /*
          * transfers is a specialization of performances and binaryLinks restricted to type 
@@ -188,7 +188,7 @@ standard library package Transfers {
         end feature target: Occurrence redefines Transfer::target, binaryLinks::target;
     }
 
-    abstract flow messageTransfers: MessageTransfer[0..*] nonunique subsets transfers {
+    abstract step messageTransfers: MessageTransfer[0..*] nonunique subsets transfers {
         doc
         /*
          * messageTransfers is a specialization of transfers restricted to type MessageTransfers.