Merge branch 'dev' into 'master'

Dev

See merge request !5

docker/Dockerfile

@@ -25,5 +25,8 @@ WORKDIR /app
 
 COPY HardwareEmulator.so ./
 COPY rmi-model-server.jar ./rmi-model-server.jar
+COPY ./autopilots/ ./autopilots/
+COPY ./autopilots/ ./autopilots/AutopilotAdapter
 
-CMD exec java -cp rmi-model-server.jar -Djava.rmi.server.codebase=file:rmi-model-server.jar -Djava.rmi.server.useLocalHostname=true rwth.rmi.model.server.RMIServer 10101 autopilots
+CMD exec java -cp rmi-model-server.jar -Djava.rmi.server.codebase=file:rmi-model-server.jar -Djava.rmi.server.hostname=localhost rwth.rmi.model.server.RMIServer 10101 autopilots --no-zookeeper \
+ no_time os=linux

install/run.bat

@@ -23,5 +23,5 @@
 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.hostname=127.0.0.1" -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 %*
 pause

install/run.sh

@@ -20,8 +20,7 @@
 # *******************************************************************************
 #
 
-./config.sh
+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=127.0.0.1" -cp rmi-model-server.jar rwth.rmi.model.server.RMIServer $PORT $AUTOPILOT_FOLDER --no-zookeeper %*
-pause
+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