Merge branch 'master' into ST6RI-823

Author: seidewitz

org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/KerMLActivator.xtend

@@ -24,7 +24,7 @@ package org.omg.kerml.xtext.ui
 
 import org.omg.kerml.xtext.ui.internal.XtextActivator
 import org.omg.kerml.xtext.KerMLRuntimeModule
-import org.omg.kerml.xmi.KerMLxRuntimeModule
+import org.omg.kerml.xtext.xmi.KerMLxRuntimeModule
 import org.omg.kerml.xtext.ui.xmi.KerMLxUIModule
 
 class KerMLActivator extends XtextActivator {

org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/xmi/KerMLxExecutableExtensionFactory.xtend

@@ -23,7 +23,7 @@
 package org.omg.kerml.xtext.ui.xmi
 
 import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory
-import org.omg.kerml.xmi.KerMLxRuntimeModule
+import org.omg.kerml.xtext.xmi.KerMLxRuntimeModule
 import org.omg.kerml.xtext.ui.KerMLActivator
 import org.osgi.framework.FrameworkUtil
 

org.omg.kerml.xtext.ui/xtend-gen/org/omg/kerml/xtext/ui/.gitignore

@@ -1,13 +1,4 @@
-/.KerMLUiModule.java._trace
-/.KerMLUiModule.xtendbin
-/KerMLUiModule.java
-/.KerMLUserKeywordHighlightingCalculator.java._trace
-/KerMLUserKeywordHighlightingCalculator.java
-/.KerMLUserKeywordHighlightingCalculator.xtendbin
-/.KerMLAntlrTokenToAttributeIdMapper_.java._trace
-/.KerMLAntlrTokenToAttributeIdMapper.java._trace
-/.KerMLHighlightingConfiguration.java._trace
-/.KerMLAntlrTokenToAttributeIdMapper.xtendbin
-/.KerMLHighlightingConfiguration.xtendbin
-/KerMLAntlrTokenToAttributeIdMapper.java
-/KerMLHighlightingConfiguration.java
+/*._trace
+/*.java
+/*.xtendbin
+

org.omg.kerml.xtext.ui/xtend-gen/org/omg/kerml/xtext/ui/xmi/.gitignore

@@ -0,0 +1,3 @@
+/*._trace
+/*.java
+/*.xtendbin

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

@@ -19,8 +19,7 @@ Require-Bundle: org.eclipse.xtext,
  com.google.gson,
  org.eclipse.xtext.common.types,
  org.objectweb.asm;bundle-version="9.3.0";resolution:=optional
-Export-Package: org.omg.kerml.xmi,
- org.omg.kerml.xtext,
+Export-Package: org.omg.kerml.xtext,
  org.omg.kerml.xtext.generator,
  org.omg.kerml.xtext.library,
  org.omg.kerml.xtext.linking,
@@ -31,6 +30,7 @@ Export-Package: org.omg.kerml.xmi,
  org.omg.kerml.xtext.serializer,
  org.omg.kerml.xtext.services,
  org.omg.kerml.xtext.util,
- org.omg.kerml.xtext.validation
+ org.omg.kerml.xtext.validation,
+ org.omg.kerml.xtext.xmi
 Import-Package: org.apache.log4j
 Bundle-Vendor: SysML v2 Submission Team

…/omg/kerml/xmi/KerMLxRuntimeModule.xtend …erml/xtext/xmi/KerMLxRuntimeModule.xtendorg.omg.kerml.xtext/src/org/omg/kerml/xmi/KerMLxRuntimeModule.xtend renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend org.omg.kerml.xtext/src/org/omg/kerml/xmi/KerMLxRuntimeModule.xtend renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend

@@ -1,6 +1,6 @@
 /**
  * SysML 2 Pilot Implementation
- * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ * Copyright (C) 2025  Model Driven Solutions, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
  *
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  */
-package org.omg.kerml.xmi
+package org.omg.kerml.xtext.xmi
 
 import com.google.inject.Binder
 import org.eclipse.emf.ecore.resource.Resource
@@ -60,4 +60,4 @@ class KerMLxRuntimeModule extends AbstractGenericResourceRuntimeModule{
 	def Class<? extends IModelLibraryProvider> bindIModelLLibraryProvider() {
 		KerMLLibraryProvider
 	}
-}
+}

…mg/kerml/xmi/KerMLxStandaloneSetup.xtend …ml/xtext/xmi/KerMLxStandaloneSetup.xtendorg.omg.kerml.xtext/src/org/omg/kerml/xmi/KerMLxStandaloneSetup.xtend renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxStandaloneSetup.xtend org.omg.kerml.xtext/src/org/omg/kerml/xmi/KerMLxStandaloneSetup.xtend renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxStandaloneSetup.xtend

@@ -1,6 +1,6 @@
 /**
  * SysML 2 Pilot Implementation
- * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ * Copyright (C) 2025  Model Driven Solutions, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
  *
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  */
-package org.omg.kerml.xmi
+package org.omg.kerml.xtext.xmi
 
 import com.google.inject.Guice
 import com.google.inject.Inject
@@ -57,4 +57,4 @@ class KerMLxStandaloneSetup implements ISetup {
 	def Injector createInjector(){
 		Guice.createInjector(new KerMLxRuntimeModule)
 	}
-}
+}

org.omg.kerml.xtext/xtend-gen/org/omg/kerml/xtext/xmi/.gitignore

@@ -0,0 +1,3 @@
+/*._trace
+/*.java
+/*.xtendbin