Fixes for issues discovered when serializing dynamic EMF model

cnf/dim_release.mvn

@@ -0,0 +1,34 @@
+org.geckoprojects.emf.utils:org.gecko.emf.rest:2.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.bson:1.2.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.bson.tests:1.0.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.collections:2.1.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.csv:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.csv.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter:2.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv:1.0.1-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv.api:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.api:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.tests:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx.api:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.json:1.4.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.json.tests:1.0.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.ods:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.ods.tests:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.pushstreams:1.1.4-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.rest.jakartars:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.rest.jaxrs:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.trees.model:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.annotations:1.2.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.bnd.library.workspace:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.jakartars.bnd.library.workspace:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.jaxrs.bnd.library.workspace:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.model:2.1.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.xlsx:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.xlsx.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.collections:2.2.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.pushstreams:1.2.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.model:2.2.0-SNAPSHOT

cnf/local/index.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1705409091790">
+<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1699736382673">
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="license" value="&quot;The Unlicense&quot;;link=&quot;https://github.com/miachm/SODS/blob/master/LICENSE&quot;"/>

org.gecko.emf.bson.tests/test.bndrun

@@ -49,14 +49,12 @@
 	org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
-	org.osgi.util.converter;version='[1.0.9,1.0.10)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	org.eclipse.emf.common;version='[2.29.0,2.29.1)',\
 	org.eclipse.emf.ecore;version='[2.35.0,2.35.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.36.0,2.36.1)',\
-	org.gecko.emf.osgi.api;version='[6.1.1,6.1.2)',\
-	org.gecko.emf.osgi.component.config;version='[6.1.1,6.1.2)',\
 	org.gecko.emf.osgi.component.minimal;version='[6.1.1,6.1.2)',\
 	org.gecko.emf.osgi.example.model.basic;version='[6.1.0,6.1.1)',\
-	org.osgi.service.cm;version='[1.6.1,1.6.2)'
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
+	org.osgi.util.converter;version='[1.0.9,1.0.10)'

org.gecko.emf.converter.model/.classpath

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

org.gecko.emf.converter.model/.gitignore

@@ -0,0 +1,4 @@
+/bin/
+/bin_test/
+/generated/
+/src/

org.gecko.emf.converter.model/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.gecko.emf.converter.model</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

org.gecko.emf.converter.model/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+encoding//.settings/org.eclipse.core.resources.prefs=UTF-8
+encoding//.settings/org.eclipse.jdt.core.prefs=UTF-8
+encoding//.settings/org.eclipse.jdt.ui.prefs=UTF-8
+encoding//model/converter.ecore=UTF-8
+encoding//model/converter.genmodel=UTF-8
+encoding/<project>=UTF-8
+encoding/bnd.bnd=UTF-8

org.gecko.emf.converter.model/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11

org.gecko.emf.converter.model/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,8 @@
+content_assist_proposals_background=255,255,255
+content_assist_proposals_foreground=0,0,0
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.formatterprofiles.version=13
+org.eclipse.jdt.ui.javadoc=true
+spelling_locale_initialized=true
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true

org.gecko.emf.converter.model/bnd.bnd

@@ -0,0 +1,19 @@
+# sets the usually required buildpath using the bnd library, you can extend it with the normal -buildpath to your liking
+-library: enable-emf
+
+# The code generation takes a bit of time and makes the build a bit slower.
+# It might be a good idea to put comments around it, when you don't need it
+
+-generate:\
+	model/converter.genmodel;\
+		generate=geckoEMF;\
+		genmodel=model/converter.genmodel;\
+		output=src;\
+		logfile=converter-genmodel.log;\
+
+# If this is not done with a instruction namespace, bnd would think you like
+# to take full control over whats exported and imported and will ignore @Export
+# Bundle Annotations		
+-includeresource.model: model=model
+
+Bundle-Version: 1.0.0.SNAPSHOT

org.gecko.emf.converter.model/model/converter.ecore

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://gecko.io/converter/1.0" nsPrefix="converter">
+  <eAnnotations source="Version">
+    <details key="value" value="1.0.0"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EDataType" name="EShortArray" instanceClassName="short[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EIntArray" instanceClassName="int[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="ELongArray" instanceClassName="long[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EFloatArray" instanceClassName="float[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EDoubleArray" instanceClassName="double[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EBooleanArray" instanceClassName="boolean[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="ECharArray" instanceClassName="char[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EByteObjectArray" instanceClassName="java.lang.Byte[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EShortObjectArray" instanceClassName="java.lang.Short[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EIntegerObjectArray" instanceClassName="java.lang.Integer[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="ELongObjectArray" instanceClassName="java.lang.Long[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EFloatObjectArray" instanceClassName="java.lang.Float[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EDoubleObjectArray" instanceClassName="java.lang.Double[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EBooleanObjectArray" instanceClassName="java.lang.Boolean[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="ECharacterObjectArray" instanceClassName="java.lang.Character[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EStringArray" instanceClassName="java.lang.String[]"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="EOSGiFrameworkVersion" instanceClassName="org.osgi.framework.Version"/>
+</ecore:EPackage>

org.gecko.emf.converter.model/model/converter.genmodel

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/org.gecko.emf.converter.model/src" modelPluginID="org.gecko.emf.converter.model"
+    modelName="converter.ecore" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" suppressGenModelAnnotations="false"
+    copyrightFields="false" operationReflection="true" importOrganizing="true" oSGiCompatible="true">
+  <foreignModel>converter.ecore</foreignModel>
+  <genPackages prefix="Converter" basePackage="org.gecko.emf.converter" disposableProviderFactory="true"
+      ecorePackage="converter.ecore#/">
+    <genDataTypes ecoreDataType="converter.ecore#//EShortArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EIntArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//ELongArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EFloatArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EDoubleArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EBooleanArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//ECharArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EByteObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EShortObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EIntegerObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//ELongObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EFloatObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EDoubleObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EBooleanObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//ECharacterObjectArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EStringArray"/>
+    <genDataTypes ecoreDataType="converter.ecore#//EOSGiFrameworkVersion"/>
+  </genPackages>
+</genmodel:GenModel>

org.gecko.emf.converter.tests/.classpath

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

org.gecko.emf.converter.tests/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/bin_test/

org.gecko.emf.converter.tests/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.gecko.emf.csv.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

org.gecko.emf.converter.tests/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/bnd.bnd=UTF-8
+encoding/test.bndrun=UTF-8

org.gecko.emf.converter.tests/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

org.gecko.emf.converter.tests/bnd.bnd

@@ -0,0 +1,16 @@
+-library: enable-emf,\
+	enableOSGi-Test
+
+javac.source: 11
+javac.target: 11
+
+Bundle-Version: 1.0.0.SNAPSHOT
+
+-buildpath: \
+	org.gecko.emf.converter;version=snapshot,\
+	org.gecko.emf.converter.model;version=snapshot,\
+	org.osgi.dto,\
+	org.osgi.util.converter;version=latest,\
+	org.osgi.util.function;version=latest
+
+-dependson: org.gecko.emf.converter