Skip to content

Commit aca4d57

Browse files
committed
ST6RI-916 - Add new org.omg.sysml.model module
- new org.omg.sysml.model plain java module (not an Eclipse plug-in) - the generated Java model code - org.omg.sysml.model/src/main/resources/model/SysML.ecore - org.omg.sysml.model/src/main/resources/model/SysML.genmodel - new org.omg.sysml.model.bundle module (Eclipse plug-in) - bridge that plain Java model into the Eclipse/OSGi world - wrap the plain org.omg.sysml.model jar and the model resources as an Eclipse bundle so PDE/Tycho plug-ins can access exported packages like org.omg.sysml.lang.sysml and resolve EMF generated-package registration through Eclipse - org.omg.sysml.model.gencode - order alphabetically ecore EClasses and eStructuralFeatures - removal of unwanted UML runtime dependencies from generated sources - updated build - Also updated SysML_.genmodel for use with Xtext (without change to Xtext builds). - And deleted types.ecore. - copy org.eclipse.uml2.common into org.omg.sysml.model. It is allowed to do that as both modules are under EPL-2.0 license. Update org.omg.sysml.uml.ecore.importer to handle that change. Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 3a1be5b commit aca4d57

532 files changed

Lines changed: 70299 additions & 69056 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ target
2222
.polyglot.META-INF
2323
dependency-reduced-pom.xml
2424

25+
#Maven
26+
.mvn/repository
27+
.mvn/maven.config
28+
.m2/
29+
.polyglot.feature.xml
30+
2531
# VS Code settings
2632
.vscode/
2733

org.omg.kerml.expressions.xtext/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
77
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
88
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
9+
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
910
<classpathentry kind="output" path="target/classes"/>
1011
</classpath>

org.omg.kerml.expressions.xtext/.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<name>org.omg.kerml.expressions.xtext</name>
44
<comment></comment>
55
<projects>
6+
<project>org.omg.sysml.model</project>
67
</projects>
78
<buildSpec>
89
<buildCommand>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.xtext,
1313
org.eclipse.xtext.util,
1414
org.eclipse.xtend.lib;bundle-version="2.14.0",
1515
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
16-
org.omg.sysml;bundle-version="0.2.0",
16+
org.omg.sysml.model.bundle;bundle-version="0.58.0",
17+
org.omg.sysml;bundle-version="0.58.0",
1718
org.eclipse.uml2.uml,
1819
org.eclipse.uml2.uml.resources,
1920
org.eclipse.xtext.common.types,

org.omg.kerml.owl/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<classpathentry kind="src" path="xtend-gen"/>
66
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
77
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
8+
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
89
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
910
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.kerml.xtext"/>
1011
<classpathentry kind="output" path="bin"/>

org.omg.kerml.owl/.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<name>org.omg.kerml.owl</name>
44
<comment></comment>
55
<projects>
6+
<project>org.omg.sysml.model</project>
67
</projects>
78
<buildSpec>
89
<buildCommand>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="ASCII"?>
22
<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
33
<mapping sourceURI="http://www.omg.org/spec/SysML/2.0/OWL" targetURI="platform:/resource/org.omg.kerml.owl/model/generated/Owl.ecore"/>
4-
<mapping sourceURI="https://www.omg.org/spec/SysML/20230201" targetURI="platform:/resource/org.omg.sysml/model/SysML.ecore"/>
4+
<mapping sourceURI="https://www.omg.org/spec/SysML/20230201" targetURI="platform:/resource/org.omg.sysml.model/src/main/resources/model/SysML.ecore"/>
55
</uriMap:MappingContainer>

org.omg.kerml.owl/transforms/SysML2OWL.qvto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
*****************************************************************************/
2424

25-
modeltype SysML uses "https://www.omg.org/spec/SysML/20230201";
25+
modeltype SysML uses "https://www.omg.org/spec/SysML/20250201";
2626
modeltype OWL uses "http://www.omg.org/spec/SysML/2.0/OWL";
2727
modeltype Ecore uses "http://www.eclipse.org/emf/2002/Ecore";
2828

org.omg.kerml.xtext.ui/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</attributes>
1010
</classpathentry>
1111
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
12+
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
1213
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
1314
<classpathentry kind="output" path="target/classes"/>
1415
</classpath>

org.omg.kerml.xtext.ui/.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<name>org.omg.kerml.xtext.ui</name>
44
<comment></comment>
55
<projects>
6+
<project>org.omg.sysml.model</project>
67
</projects>
78
<buildSpec>
89
<buildCommand>

0 commit comments

Comments
 (0)