fixes include mechanism

.gitignore

@@ -1,3 +1,4 @@
 /.launch/
 /.settings/
 /*.json
+/.m2

.launch/CoreDSL2JSON change version.launch

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="org.eclipse.tycho:tycho-versions-plugin:set-version"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value=""/>
+    <listAttribute key="M2_PROPERTIES">
+        <listEntry value="tycho.mode=maven"/>
+        <listEntry value="newVersion=${string_prompt:version string}"/>
+        <listEntry value="maven.repo.local=${workspace_loc:/com.minres.coredsl.json.parent}/.m2"/>
+    </listAttribute>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/com.minres.coredsl.json.parent}"/>
+</launchConfiguration>

.launch/CoreDSL2JSON clean.launch

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="clean"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value=""/>
+    <listAttribute key="M2_PROPERTIES"/>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.coredsl.json.parent}"/>
+</launchConfiguration>

.launch/CoreDSL2JSON package.launch

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="package"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value=""/>
+    <listAttribute key="M2_PROPERTIES">
+        <listEntry value="maven.repo.local=${project_loc:com.minres.coredsl.json.parent}/.m2"/>
+    </listAttribute>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.coredsl.json.parent}"/>
+</launchConfiguration>

com.minres.coredsl.json.repository/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>com.minres.coredsl.json.parent</artifactId>
         <groupId>com.minres.coredsl</groupId>
-        <version>2.0.2</version>
+        <version>2.0.3</version>
         <relativePath>..</relativePath>
     </parent>
 	<artifactId>com.minres.coredsl.json.standalone</artifactId>

com.minres.coredsl.json.target/com.minres.coredsl.json.target.target

@@ -39,7 +39,7 @@
             <unit id="org.json" version="1.0.0.v201011060100"/>
         </location>
     	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.19"/>
+        	<repository location="https://minres.github.io/CoreDSL/repository/2.0/2.0.20"/>
 	    	<unit id="com.minres.coredsl.feature.source.feature.group" version="0.0.0"/>
         	<unit id="com.minres.coredsl.feature.feature.group" version="0.0.0"/>
     	</location>

com.minres.coredsl.json.target/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.json.parent</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	        <relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.coredsl.json.target</artifactId>

com.minres.coredsl.json.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: com.minres.coredsl.json.dbt_rise.tests
 Bundle-ManifestVersion: 2
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.2
+Bundle-Version: 2.0.3
 Bundle-SymbolicName: com.minres.coredsl.json.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl.json;bundle-version="1.0.0",

com.minres.coredsl.json.tests/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.json.parent</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
 	        <relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.coredsl.json.tests</artifactId>

com.minres.coredsl.json/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: com.minres.coredsl.json
 Bundle-ManifestVersion: 2
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.2
+Bundle-Version: 2.0.3
 Bundle-SymbolicName: com.minres.coredsl.json;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl;bundle-version="2.0.0",
@@ -12,7 +12,7 @@ Require-Bundle: com.minres.coredsl;bundle-version="2.0.0",
  org.eclipse.equinox.preferences;bundle-version="3.8.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.eclipse.xtext;bundle-version="2.22.0",
- org.eclipse.emf.mwe.utils;bundle-version="1.6.2",
+ org.eclipse.emf.mwe.utils,
  org.apache.commons.logging;bundle-version="1.2.0",
  org.json;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17

com.minres.coredsl.json/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.json.parent</artifactId>
-		<version>2.0.2</version>
+		<version>2.0.3</version>
         	<relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.coredsl.json</artifactId>

com.minres.coredsl.json/src/com/minres/coredsl/json/CoreDslGeneratorModule.xtend

@@ -8,6 +8,8 @@ import org.eclipse.xtext.generator.JavaIoFileSystemAccess
 import org.eclipse.xtext.generator.IOutputConfigurationProvider
 import javax.inject.Singleton
 import com.minres.coredsl.json.GeneratorOutputConfigurationProvider
+import org.eclipse.xtext.scoping.impl.ImportUriResolver
+import com.minres.coredsl.scoping.IncludeUriResolver
 
 /** 
  * Use this class to register components to be used at runtime / without the Equinox extension registry.
@@ -21,11 +23,11 @@ import com.minres.coredsl.json.GeneratorOutputConfigurationProvider
             .in(Singleton);
         binder.bind(IFileSystemAccess2)
             .to(JavaIoFileSystemAccess)
+        binder.bind(ImportUriResolver)
+        	.to(IncludeUriResolver);
     }
 
     def Class<? extends IGenerator2> bindIGenerator2() {
-        // return DummyGenerator.class;
         return typeof(CoreDslJsonGenerator)
     }
-
 }

com.minres.coredsl.json/src/com/minres/coredsl/json/Main.xtend

@@ -38,8 +38,8 @@ class Main implements Callable<Integer> {
     @Option(names=#["-o", "--output-file"], description="output file")
     public File outputFile;
 
-    @Option(names=#["-r", "--repository"], description="repository directory")
+    @Option(names=#["-r", "--repository"], description="one ore more repository directories")
-    public String repository = "";
+    public String[] repositories;
 
     @Option(names=#["-v", "--verbose"], description="verbose output")
     public Boolean verbose = false;
@@ -70,12 +70,12 @@ class GeneratorMain {
     @Inject JavaIoFileSystemAccess fsa
 
     def run(Main params) {
-        if (params.repository.length > 0) {
+        params.repositories.forEach[repository, idx|
             val projectMapping = new ProjectMapping
-            projectMapping.projectName = "CoreDSL Repository"
+            projectMapping.projectName = "Repository:"+idx
-            projectMapping.path = params.repository
+            projectMapping.path = repository
             new StandaloneSetup().addProjectMapping(projectMapping)
-        }
+        ]
         try {
             for (file : params.files) {
                 // Load the resource

generate.sh

@@ -37,7 +37,7 @@ if [ $# -lt 1 ]; then
 fi
 
 INPUT_FILE=$1
-GENERATOR_JAR=${SCRIPTDIR}/com.minres.coredsl.json.repository/target/com.minres.coredsl.json-2.0.2.jar
+GENERATOR_JAR=${SCRIPTDIR}/com.minres.coredsl.json.repository/target/com.minres.coredsl.json-2.0.3.jar
 JAVA_OPTS="--add-modules ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.annotation=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.module=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.math=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.net.spi=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.channels=ALL-UNNAMED --add-opens=java.base/java.nio.channels.spi=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.nio.charset.spi=ALL-UNNAMED --add-opens=java.base/java.nio.file=ALL-UNNAMED --add-opens=java.base/java.nio.file.attribute=ALL-UNNAMED --add-opens=java.base/java.nio.file.spi=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.security.acl=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.security.interfaces=ALL-UNNAMED --add-opens=java.base/java.security.spec=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.text.spi=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.time.chrono=ALL-UNNAMED --add-opens=java.base/java.time.format=ALL-UNNAMED --add-opens=java.base/java.time.temporal=ALL-UNNAMED --add-opens=java.base/java.time.zone=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens=java.base/java.util.function=ALL-UNNAMED --add-opens=java.base/java.util.jar=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.util.spi=ALL-UNNAMED --add-opens=java.base/java.util.stream=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.datatransfer/java.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/java.applet=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.color=ALL-UNNAMED --add-opens=java.desktop/java.awt.desktop=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED --add-opens=java.desktop/java.awt.geom=ALL-UNNAMED --add-opens=java.desktop/java.awt.im=ALL-UNNAMED --add-opens=java.desktop/java.awt.im.spi=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.image.renderable=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.print=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-opens=java.desktop/java.beans.beancontext=ALL-UNNAMED --add-opens=java.instrument/java.lang.instrument=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.management/java.lang.management=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-opens=java.rmi/java.rmi=ALL-UNNAMED --add-opens=java.rmi/java.rmi.activation=ALL-UNNAMED --add-opens=java.rmi/java.rmi.dgc=ALL-UNNAMED --add-opens=java.rmi/java.rmi.registry=ALL-UNNAMED --add-opens=java.rmi/java.rmi.server=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED"
 GENERATOR="java $JAVA_OPTS -jar ${GENERATOR_JAR} "
 

pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.coredsl</groupId>
-	<version>2.0.2</version>
+	<version>2.0.3</version>
 	<artifactId>com.minres.coredsl.json.parent</artifactId>
 	<packaging>pom</packaging>
 
@@ -95,7 +95,7 @@
 						<artifact>
 							<groupId>com.minres.coredsl</groupId>
 							<artifactId>com.minres.coredsl.json.target</artifactId>
-							<version>2.0.2</version>
+							<version>2.0.3</version>
 						</artifact>
 					</target>
 					<environments>