Version & License update

.gitlab-ci.yml

@@ -5,6 +5,7 @@
 # can be found under https://github.com/MontiCore/monticore.
 #
 
+
 stages:
 - build
 

docker/Dockerfile

@@ -5,6 +5,7 @@
 # can be found under https://github.com/MontiCore/monticore.
 #
 
+
 FROM openjdk:8
 
 WORKDIR /app

docker/build.sh

@@ -6,6 +6,7 @@
 # can be found under https://github.com/MontiCore/monticore.
 #
 
+
 rm rmi-model-server-*.jar
 cp ../target/rmi-model-server-*-jar-with-dependencies.jar ./rmi-model-server.jar
 cp ../install/HardwareEmulator.so ./

docs/latex/emulator_configuration.aux

+\relax 
+\newlabel{emuconfig}{{}{1}}
+\newlabel{tab:emuconfig}{{}{1}}
+\newlabel{tab:managerconfig}{{}{1}}
+\newlabel{tab:managerqueries}{{}{1}}
+\newlabel{tab:emuqueries}{{}{1}}

docs/latex/emulator_configuration.fdb_latexmk

+# Fdb version 3
+["pdflatex"] 1568890713 "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.tex" "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.pdf" "emulator_configuration" 1568890713
+  "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmbx10.tfm" 1136768653 1328 c834bbb027764024c09d3d2bf908b5f0 ""
+  "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmitt10.tfm" 1136768653 768 2297ad2ac26f37e67f756dad27c77d68 ""
+  "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmti10.tfm" 1136768653 1480 aa8e34af0eb6a2941b776984cf1dfdc4 ""
+  "C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmtt10.tfm" 1136768653 768 1321e9409b4137d6fb428ac9dc956269 ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmbx10.pfb" 1247596666 34811 78b52f49e893bcba91bd7581cdc144c0 ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmitt10.pfb" 1247596666 26057 4749ebe351ca6b60601cf0ab49d1bf5d ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmmi10.pfb" 1247596667 36299 5f9df58c2139e7edcf37c8fca4bd384d ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmmi7.pfb" 1247596667 36281 c355509802a035cadc5f15869451dcee ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmr10.pfb" 1247596667 35752 024fb6c41858982481f6968b5fc26508 ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmsy10.pfb" 1247596667 32569 5e5ddc8df908dea60932f3c484a54c0d ""
+  "C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmtt10.pfb" 1247596667 31099 342ef5a582aacbd3346f3cf4579679fa ""
+  "C:/Users/Jean/AppData/Local/MiKTeX/2.9/miktex/data/le/pdftex/pdflatex.fmt" 1562925836 4235381 0468f7ea654e25346755a1cc34bf5b43 ""
+  "C:/Users/Jean/AppData/Local/MiKTeX/2.9/pdftex/config/pdftex.map" 1562925912 80453 73224248f0a73acd005b5611945eaaa6 ""
+  "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.aux" 1568890713 9 a94a2480d3289e625eea47cd1b285758 ""
+  "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.tex" 1568890711 8550 c3bfea48587967d0f21fa2e13e69064c ""
+  "emulator_configuration.aux" 0 -1 0 "pdflatex"
+  "emulator_configuration.tex" 1568890711 8550 c3bfea48587967d0f21fa2e13e69064c ""
+  (generated)
+  "emulator_configuration.aux"
+  "emulator_configuration.pdf"
+  "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.log"
+  "emulator_configuration.log"
+  "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.pdf"

docs/latex/emulator_configuration.fls

+PWD b:\montisim-setup\repos\RMIModelServer\docs\latex
+INPUT C:\Users\Jean\AppData\Local\MiKTeX\2.9\miktex\data\le\pdftex\pdflatex.fmt
+INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.tex
+OUTPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.log
+INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmtt10.tfm
+INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmitt10.tfm
+INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
+INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
+OUTPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
+INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmbx10.tfm
+INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmti10.tfm
+OUTPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.pdf
+INPUT C:\Users\Jean\AppData\Local\MiKTeX\2.9\pdftex\config\pdftex.map
+INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmbx10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmbx10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmitt10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmitt10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi7.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi7.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmr10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmr10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmsy10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmsy10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmtt10.pfb
+INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmtt10.pfb

docs/latex/emulator_configuration.tex

@@ -3,7 +3,6 @@
 % The license generally applicable for this project
 % can be found under https://github.com/MontiCore/monticore.
 
-
 \usepackage{graphicx}
 %\usepackage{ngerman}
 \usepackage[utf8x]{inputenc}

docs/latex/make.bat

@@ -5,6 +5,7 @@
 @REM can be found under https://github.com/MontiCore/monticore.
 @REM
 
+
 @echo off
 set GENDIR=target\
 set MAINNAME=emulator_configuration

install/config.bat

@@ -5,6 +5,7 @@
 @REM can be found under https://github.com/MontiCore/monticore.
 @REM
 
+
 @REM Please replace this with the path to the Autopilot(s)
 set AUTOPILOT_FOLDER=autopilots
 

install/config.sh

@@ -6,6 +6,7 @@
 # can be found under https://github.com/MontiCore/monticore.
 #
 
+
 # Please replace this with the path to the Autopilot(s)
 AUTOPILOT_FOLDER=autopilots
 

install/demo/basic-linux.bat

-@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
-
-@echo off
-pushd ..
-call run.bat os=linux cpu_frequency=10000000 memory_frequency=1000000 cache_DL1=128,1,2 cache_IL1=128,1,2 cache_L2=1024,10,15 export debug=unsupported_syscalls
-popd

install/demo/basic.bat

-@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
-
-@echo off
-pushd ..
-call run.bat test_real os=windows cpu_frequency=10000000 memory_frequency=1000000 cache_DL1=128,1,2 cache_IL1=128,1,2 cache_L2=1024,10,15 export
-popd

install/demo/no-cache.bat

-@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
-
-@echo off
-pushd ..
-call run.bat test_real os=windows cpu_frequency=10000000 memory_frequency=1000000 export
-popd

install/demo/no-time.bat

-@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
-
-@echo off
-pushd ..
-call run.bat os=windows no_time test_real
-popd

install/demo/slow-cpu.bat

-@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
-
-@echo off
-pushd ..
-call run.bat test_real os=windows cpu_frequency=1500000 memory_frequency=150000 cache_DL1=128,1,2 cache_IL1=128,1,2 cache_L2=1024,10,15 export
-popd

install/readme.md

-<!-- (c) https://github.com/MontiCore/monticore -->
 ## install
 
 This folder contains a sample setup of the RMIModelServer using the HardwareEmulator.

install/run.bat

@@ -5,6 +5,7 @@
 @REM can be found under https://github.com/MontiCore/monticore.
 @REM
 
+
 @echo off
 call config.bat
 

install/run.sh

@@ -6,6 +6,7 @@
 # can be found under https://github.com/MontiCore/monticore.
 #
 
+
 source ./config.sh
 
 echo "Starting RMIModelServer on port $PORT with Autopilot folder: $AUTOPILOT_FOLDER"

install/run_with_zookeeper.bat

@@ -5,6 +5,7 @@
 @REM can be found under https://github.com/MontiCore/monticore.
 @REM
 
+
 @echo off
 call config.bat
 

install/run_with_zookeeper.sh

@@ -6,6 +6,7 @@
 # can be found under https://github.com/MontiCore/monticore.
 #
 
+
 if [ -z "$1" ]; then
     PORT=10101
 else

pom.xml

@@ -11,15 +11,15 @@
 
     <groupId>montisim</groupId>
     <artifactId>rmi-model-server</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <packaging>jar</packaging>
 
     <name>rmi-model-server</name>
 
     <properties>
         <!-- USE THESE TO SET THE VERSIONS OF THE DEPENDENCIES FOR ALL THE SUB-PROJECTS -->
-        <commons.version>1.0.9</commons.version>
-        <hardware_emulator.version>1.0.0</hardware_emulator.version>
+        <commons.version>1.0.10</commons.version>
+        <hardware_emulator.version>1.0.1</hardware_emulator.version>
 
         <!-- .. SE-Libraries .................................................. -->
         <monticore.version>4.5.4.08.11.2017</monticore.version>
@@ -153,30 +153,27 @@
 
             <!-- to add copyright information automatically-->
             <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>${project.baseUri}/license/se/license.txt</header>
-                    <properties>
-                        <owner>Michael von Wenckstern</owner>
-                        <email>vonwenckstern@se-rwth.de</email>
-                    </properties>
-                    <excludes>
-                        <exclude>src/test/resources/**</exclude>
-                        <exclude>src/main/resources/**</exclude>
-                        <exclude>license/se/license.txt</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
+                    <groupId>com.mycila</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <version>3.0</version>
+                    <configuration>
+                        <header>${project.baseUri}/src/license/se/license.txt</header>
+                        <excludes>
+                            <exclude>**/README</exclude>
+                            <exclude>src/test/resources/**</exclude>
+                            <exclude>src/main/resources/**</exclude>
+                            <exclude>src/license/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>format</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                        </execution>
+                    </executions>
+                </plugin>
 
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>