Merge branch 'dev' into 'master'

Dev

See merge request !6

install/run.sh

@@ -23,4 +23,4 @@
 source ./config.sh
 
 echo "Starting RMIModelServer on port $PORT with Autopilot folder: $AUTOPILOT_FOLDER"
-java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.hostname=localhost" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer $PORT $AUTOPILOT_FOLDER --no-zookeeper
+java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.hostname=localhost" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer $PORT $AUTOPILOT_FOLDER --no-zookeeper os=linux no_time

install/run_with_zookeeper.bat

+@REM
+@REM
+@REM  ******************************************************************************
+@REM  MontiCAR Modeling Family, www.se-rwth.de
+@REM  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+@REM  All rights reserved.
+@REM
+@REM  This project is free software; you can redistribute it and/or
+@REM  modify it under the terms of the GNU Lesser General Public
+@REM  License as published by the Free Software Foundation; either
+@REM  version 3.0 of the License, or (at your option) any later version.
+@REM  This library is distributed in the hope that it will be useful,
+@REM  but WITHOUT ANY WARRANTY; without even the implied warranty of
+@REM  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+@REM  Lesser General Public License for more details.
+@REM
+@REM  You should have received a copy of the GNU Lesser General Public
+@REM  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+@REM *******************************************************************************
+@REM
+
+@echo off
+call config.bat
+
+echo Starting RMIModelServer on port %PORT% with Autopilot folder: %AUTOPILOT_FOLDER%
+java "-Djava.rmi.server.codebase=file:rmi-model-server.jar" "-Djava.rmi.server.useLocalHostname" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer %PORT% %AUTOPILOT_FOLDER% os=windows no_time %*
+pause

install/run_with_zookeeper.sh

+#!/usr/bin/env bash
+
+if [ -z "$1" ]; then
+    PORT=10101
+else
+    PORT="$1"
+fi
+
+AUTOPILOT_FOLDER=autopilots
+
+java -cp rmi-model-server.jar\
+    -Djava.rmi.server.codebase=file:rmi-model-server.jar\
+    -Djava.rmi.server.useLocalHostname rwth.rmi.model.server.RMIServer\
+     $PORT $AUTOPILOT_FOLDER os=linux no_time

scripts/compile_install.sh

@@ -21,9 +21,7 @@
 #
 
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-pushd DIR/..
-mvn clean install -s "settings.xml"
+cd ..
+mvn clean install -s settings.xml -DskipTests
 cd target
-cp "rmi-model-server-*-jar-with-dependencies.jar" "../install/rmi-model-server.jar"
-popd
+cp rmi-model-server-*-jar-with-dependencies.jar ../install/rmi-model-server.jar
\ No newline at end of file