Version & License update

.gitlab-ci.yml

+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 image: maven:3-jdk-8
 

.travis.yml

-# (c) https://github.com/MontiCore/monticore  
 script:
 - git checkout ${TRAVIS_BRANCH}
 - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report --settings "settings.xml"

README.md

-<!-- (c) https://github.com/MontiCore/monticore -->
 # Server
 ![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/build.svg)
 ![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/coverage.svg)

dependency-reduced-pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) https://github.com/MontiCore/monticore -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>montisim</artifactId>

docker/World.zone.xml

-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <zone>
   <name>World</name>
   <isCustomLogin>false</isCustomLogin>

docker/docker-compose.yml

+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 version: "3"
 
 services:

docker/postgres/Dockerfile

+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 FROM postgres:latest
 
 COPY ./db-create-script.sql /docker-entrypoint-initdb.d/
\ No newline at end of file

docker/postgres/db-create-script.sql

+--
+-- (c) https://github.com/MontiCore/monticore
+--
+-- The license generally applicable for this project
+-- can be found under https://github.com/MontiCore/monticore.
+--
+
 --
 -- PostgreSQL database dump
 --

docs/DBscripts/sqlite-create-script.bat

-@rem (c) https://github.com/MontiCore/monticore  
+@REM
+@REM (c) https://github.com/MontiCore/monticore
+@REM
+@REM The license generally applicable for this project
+@REM can be found under https://github.com/MontiCore/monticore.
+@REM
+
 sqlite3 world.db ".read sqlite-world.sql"

docs/DBscripts/sqlite-create-script.sh

 #!/bin/bash
+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 sqlite3 world_linux.db ".read sqlite-world.sql"

docs/DBscripts/sqlite-world.sql

+--
+-- (c) https://github.com/MontiCore/monticore
+--
+-- The license generally applicable for this project
+-- can be found under https://github.com/MontiCore/monticore.
+--
+
 CREATE TABLE area (
     id integer NOT NULL PRIMARY KEY AUTOINCREMENT,
     minx double precision NOT NULL,

docs/DBscripts/sqlite_world.sql

+--
+-- (c) https://github.com/MontiCore/monticore
+--
+-- The license generally applicable for this project
+-- can be found under https://github.com/MontiCore/monticore.
+--
+

docs/scripts/deploy.bat

-@rem (c) https://github.com/MontiCore/monticore  
+@REM
+@REM (c) https://github.com/MontiCore/monticore
+@REM
+@REM The license generally applicable for this project
+@REM can be found under https://github.com/MontiCore/monticore.
+@REM
+
 REM Batch script
 
 SET CONFIG_DIR=main\resources

docs/scripts/deploy.sh

 #!/bin/bash
+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 CONFIG_DIR="main/resources"
 CONFIG_FILE="config.properties"

docs/scripts/recompile_fmu.sh

 #!/usr/bin/env bash
+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 # This script re-compile all *.fmu files in the current directory using
 # current available c++ compiler. This makes the fmu files compatible with

main/resources/aachen.sim

-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 4h;
     

main/resources/aachen2.sim

-/* (c) https://github.com/MontiCore/monticore */
 sim Aachen {
     sim_duration 4h;
 

main/resources/config.properties

+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 map=/extensions/AllInOne/aachen.osm
 mapName=Aachen2
 flat_map=true

pom.xml

 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
 
     <artifactId>server</artifactId>
     <groupId>montisim</groupId>
-    <version>2.0.0</version>
-    <packaging>pom</packaging>
+    <version>2.0.1</version>
+    <packaging>jar</packaging>
 
     <!--<modules>-->
     <!--<module>rpc</module>-->
@@ -15,15 +22,17 @@
 
 
     <properties>
-        <montisim.commons.version>1.0.9</montisim.commons.version>
+        <montisim.commons.version>1.0.10</montisim.commons.version>
         <montisim.simulation.version>2.0.2</montisim.simulation.version>
-        <montisim.controller.version>1.0.3</montisim.controller.version>
+        <montisim.controller.version>1.0.4</montisim.controller.version>
+        <montisim.rmimodelserver.version>1.1.4</montisim.rmimodelserver.version>
+        <montisim.simlang.version>1.0.1</montisim.simlang.version>
 
         <smartfox.version>2.13</smartfox.version>
 
         <!-- .. Plugins ....................................................... -->
         <assembly.plugin>2.5.4</assembly.plugin>
-        <compiler.plugin>3.3</compiler.plugin>
+        <!-- <compiler.plugin>3.3</compiler.plugin> -->
         <source.plugin>2.4</source.plugin>
         <shade.plugin>2.4.3</shade.plugin>
         <jacoco.plugin>0.8.1</jacoco.plugin>
@@ -160,7 +169,7 @@
         <dependency>
             <groupId>montisim</groupId>
             <artifactId>rmi-model-server</artifactId>
-            <version>1.1.3</version>
+            <version>${montisim.rmimodelserver.version}</version>
         </dependency>
         <!-- Autopilot -->
         <dependency>
@@ -172,7 +181,7 @@
         <dependency>
             <groupId>de.monticore.lang.montisim</groupId>
             <artifactId>SimLang</artifactId>
-            <version>1.0.1</version>
+            <version>${montisim.simlang.version}</version>
         </dependency>
         <dependency>
             <groupId>de.monticore.lang.montisim</groupId>
@@ -218,8 +227,8 @@
             </activation>
             <properties>
                 <script.extension>.bat</script.extension>
-                <sfs.directory>C:\SmartFoxServer_2X\SFS2X</sfs.directory>
-                <sfs.extensions>${sfs.directory}\extensions\AllInOne</sfs.extensions>
+                <sfs.directory>${project.basedir}/../../SFS2X</sfs.directory>
+                <sfs.extensions>${sfs.directory}/extensions/AllInOne</sfs.extensions>
             </properties>
         </profile>
         <profile>
@@ -248,7 +257,7 @@
             <!-- Other Configuration -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.plugin}</version>
+                <version>3.8.0</version>
                 <configuration>
                     <useIncrementalCompilation>true</useIncrementalCompilation>
                     <source>${java.version}</source>
@@ -299,7 +308,7 @@
 
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>package rwth.server.extensions.ZoneExt</mainClass>
+                                    <mainClass>rwth.server.extensions.ZoneExt</mainClass>
                                 </transformer>
                             </transformers>
                             <outputFile>${sfs.extensions}/${project.name}.jar</outputFile>
@@ -330,23 +339,20 @@
                     </execution>
                 </executions>
             </plugin>
+            
+            
             <!-- to add copyright information automatically-->
-            <!--
             <plugin>
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
                     <version>3.0</version>
                     <configuration>
                         <header>${project.baseUri}/src/license/se/license.txt</header>
-                    <properties>
-                        <owner>Michael von Wenckstern</owner>
-                        <email>vonwenckstern@se-rwth.de</email>
-                    </properties>
                         <excludes>
                             <exclude>**/README</exclude>
-                        <exclude>src/test/resources/**</exclude>
-                        <exclude>src/main/resources/**</exclude>
-                        <exclude>src/license/**</exclude>
+                            <exclude>**/src/test/resources/**</exclude>
+                            <exclude>**/src/main/resources/**</exclude>
+                            <exclude>**/license/**</exclude>
                         </excludes>
                     </configuration>
                     <executions>
@@ -358,7 +364,7 @@
                         </execution>
                     </executions>
                 </plugin>
-            -->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

restful/Dockerfile

+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 FROM openjdk:8-jdk
 
 WORKDIR /app

restful/README.md

-<!-- (c) https://github.com/MontiCore/monticore -->
-
 
 This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also
 retrieving the results.

restful/build.sh

 #!/usr/bin/env bash
+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 cp ./target/classes/app.db app.db
 cp ./target/restful-2.0.0.jar app.jar

restful/dev.yml

+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 version: "3"
 
 services:

restful/openapi.yml

+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 swagger: "2.0"
 info:
   description: "API doc for MontiSim server"

restful/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) https://github.com/MontiCore/monticore -->
+<!--
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -8,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4.RELEASE</version>
+        <version>2.1.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -19,7 +26,6 @@
 
     <properties>
         <montisim.simulation.version>2.0.2</montisim.simulation.version>
-
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -62,6 +68,7 @@
             <scope>compile</scope>
         </dependency>
 
+
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
@@ -209,6 +216,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <version>RELEASE</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                  <groupId>org.springframework.boot</groupId>
+                  <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+              </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -270,7 +283,7 @@
                 </executions>
             </plugin>
         </plugins>
-        <finalName>restful</finalName>
+        <!--<finalName>restful</finalName>-->
     </build>
 
     <distributionManagement>

restful/run_test.sh

 #!/usr/bin/env bash
+#
 # (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 
 # this script serves the purpose of running unitetests in gitlab-runner.
 # It starts all dependent services needed before starting the tests.

restful/src/main/java/server/restful/Server.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful;
 
 import de.monticore.lang.montisim.simlang.SimLangTool;

restful/src/main/java/server/restful/SwaggerConfig.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful;
 
 import com.google.common.base.Predicates;

restful/src/main/java/server/restful/dao/BaseDAO.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import org.slf4j.Logger;

restful/src/main/java/server/restful/dao/CarDAO.java

+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import server.restful.model.CarModel;

restful/src/main/java/server/restful/dao/MapDAO.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import server.restful.model.MapModel;

restful/src/main/java/server/restful/dao/ScenarioDAO.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import server.restful.model.ScenarioModel;

restful/src/main/java/server/restful/dao/SimulationDAO.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.dao;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

restful/src/main/java/server/restful/graph/MetisGraph.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;

restful/src/main/java/server/restful/graph/OverlayUtil.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.commons.controller.commons.Vertex;

restful/src/main/java/server/restful/graph/structures/OverlayEdge.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.graph.structures;
 
 import de.rwth.monticore.EmbeddedMontiArc.simulators.controller.library.structures.Edge;

restful/src/main/java/server/restful/model/CarModel.java

+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

restful/src/main/java/server/restful/model/Dataframe.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 package server.restful.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

restful/src/main/java/server/restful/model/MapModel.java

-/* (c) https://github.com/MontiCore/monticore */
+/**
+ * (c) https://github.com/MontiCore/monticore