Renamed module de.evoal.core to de.evoal.core.main. Thus, this commut implements #2

ci/create-release.sh

@@ -7,7 +7,7 @@ RELEASE_PLUGINS="generator.main surrogate.api surrogate.simple surrogate.svr app
 mkdir -p evoal/plugins
 
 cp src/languages/de.evoal.languages.releng.site/target/de.evoal.languages.releng.site-*.zip "evoal/eclipse-update-site.zip"
-cp -r src/core/de.evoal.core/target/core evoal/modules
+cp -r src/core/de.evoal.core.main/target/core.main evoal/modules
 
 for NAME in $RELEASE_PLUGINS; do
     echo "Copying plugin $NAME"
@@ -40,11 +40,11 @@ rm -rf xtext-merge
 # let's copy the scripts to the correct location
 mkdir bin
 
-cp -r ../src/core/de.evoal.core/scripts/* "bin"
+cp -r ../src/core/de.evoal.core.main/scripts/* "bin"
 for NAME in $RELEASE_PLUGINS; do
     echo "Copying scripts of plugin $NAME"
 
     if [ -e ../src/core/de.evoal.$NAME/scripts ]; then
       cp -r ../src/core/de.evoal.$NAME/scripts/* bin
     fi
-done
\ No newline at end of file
+done

src/core/de.evoal.approximative.density/src/main/java/module-info.java

@@ -8,7 +8,7 @@ module de.evoal.approximative.density {
 
     requires de.evoal.languages.model.instance;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.surrogate.api;
 
     requires smile.math;

src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh

@@ -10,11 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=extract-data-definition-from-arff \
      -Barff:input=$2 \
      -Barff:output=$3

src/core/de.evoal.core.arff/scripts/run-convert-arff.sh

@@ -10,11 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=convert-arff-to-json \
      -Barff:input=$2 \
      -Barff:ddl-specification=$3 \

src/core/de.evoal.core.arff/src/main/java/module-info.java

@@ -11,7 +11,7 @@ module de.evoal.core.arff {
 
     requires weka.stable;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.languages.model.ddl;
     requires de.evoal.languages.model.ddl.dsl;
 

src/core/de.evoal.core/pom.xml → src/core/de.evoal.core.main/pom.xml

@@ -11,8 +11,8 @@
 		<relativePath>../de.evoal.releng.parent</relativePath>
 	</parent>
 
-	<artifactId>core</artifactId>
-	<name>EvoAl - Core</name>
+	<artifactId>core.main</artifactId>
+	<name>EvoAl - Core - Main</name>
 
 	<properties>
 		<javax.activation.version>1.2.0</javax.activation.version>
@@ -324,13 +324,13 @@
 					</annotationProcessorPaths>
 					<compilerArgs>
 						<arg>--add-exports</arg>
-						<arg>io.jenetics.base/io.jenetics.internal.math=de.evoal.core</arg>
+						<arg>io.jenetics.base/io.jenetics.internal.math=de.evoal.core.main</arg>
 						<arg>--add-exports</arg>
-						<arg>io.jenetics.base/io.jenetics.internal.util=de.evoal.core</arg>
+						<arg>io.jenetics.base/io.jenetics.internal.util=de.evoal.core.main</arg>
 						<arg>--add-exports</arg>
-						<arg>io.jenetics.base/io.jenetics.internal.collection=de.evoal.core</arg>
+						<arg>io.jenetics.base/io.jenetics.internal.collection=de.evoal.core.main</arg>
 						<arg>--add-exports</arg>
-						<arg>org.eclipse.xtext.util/org.eclipse.xtext.util=de.evoal.core</arg>
+						<arg>org.eclipse.xtext.util/org.eclipse.xtext.util=de.evoal.core.main</arg>
 					</compilerArgs>
 					<forceJavacCompilerUse>true</forceJavacCompilerUse>
 				</configuration>

src/core/de.evoal.core.main/scripts/paths.env

+EVOALPATH=$( cd -- "$(dirname $0)/.." >/dev/null 2>&1 ; pwd -P )
+PLUGIN_PATHS=`ls -d "${EVOALPATH}/plugins"/* | tr '\n' ':'`
+
+CLASSPATH="-Dorg.jboss.logging.provider=slf4j \
+          --module-path ${EVOALPATH}/modules/:$PLUGIN_PATHS \
+          --add-modules ALL-MODULE-PATH \
+          --add-opens java.base/java.lang=guice \
+          --add-exports io.jenetics.base/io.jenetics.internal.math=de.evoal.core.main \
+          --add-exports io.jenetics.base/io.jenetics.internal.collection=de.evoal.core.main \
+          --add-exports io.jenetics.base/io.jenetics.internal.util=de.evoal.core.main \
+          -m de.evoal.core.main/de.evoal.core.main.Evoal"
\ No newline at end of file

src/core/de.evoal.core/scripts/run-search.sh → src/core/de.evoal.core.main/scripts/run-search.sh

@@ -10,14 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     --add-exports io.jenetics.base/io.jenetics.internal.math=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.collection=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.util=de.evoal.core \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      "-Bcore:main=heuristic-search" \
      "-Bcore:optimisation-configuration-file=$2" \
      "-Bcore:evaluation-output-folder=$3"