diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f13ae4893f1b23634779b0a0b3ff7e5c8d4e3cb..6d9411ae5f2725f48fba6b6de26af63b1ebd7870 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore # stages: diff --git a/.travis.yml b/.travis.yml index 14d9656b238f5660ba882b6781ff7fa85fcd7985..522051d971a294b85c8d5964439fc6540c3fc134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore script: - git checkout ${TRAVIS_BRANCH} diff --git a/README.md b/README.md index e2e14442840ab994c2aecbd0bb132612fb65457a..aaca27475eee418c565a483ec6b2ac92c8291e1e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + [![Build Status](https://travis-ci.org/MontiSim/RMIModelServer.svg?branch=master)](https://travis-ci.org/MontiSim/RMIModelServer) [![Maintainability](https://api.codeclimate.com/v1/badges/55c8774bfd4d37534691/maintainability)](https://codeclimate.com/github/MontiSim/RMIModelServer/maintainability) @@ -108,4 +109,4 @@ New autopilots might trigger new unsupported features: * Unsupported system calls (enable `debug=unsupported_syscalls` flag for the autopilot emulator). These are operating system functions for which no current emulation is implemented. These have to be added and registered in the `hardware_emulator/src/os_linux/linux_calls.h / .cpp` files for Linux and in the `hardware_emulator/src/os_windows/windows_calls.h / .cpp` files for Windows. * Unsupported instruction time value. The time table (currently `hardware_emulator/src/timetable/skylake.txt`) describing the number of CPU cycles for every instruction is manually filled. It currently only contains entries (!=0) for encountered instructions. It can be filled with elements from the `hardware_emulator/docs/instruction_time.txt` file (which contains entries from the instruction_tables.pdf file). -To make sure the autopilot emulation is correct, allocate an autopilot emulator with the `test_real` flag. When loading an autopilot with the same OS as the RMIModelServer, the emulator will compare the outputs of the emulated autopilot with the outputs of the actual autopilot program. \ No newline at end of file +To make sure the autopilot emulation is correct, allocate an autopilot emulator with the `test_real` flag. When loading an autopilot with the same OS as the RMIModelServer, the emulator will compare the outputs of the emulated autopilot with the outputs of the actual autopilot program. diff --git a/docker/build.sh b/docker/build.sh old mode 100755 new mode 100644 index 5bc44f9c6914fa9e6562ac5bdf2bd52035cbd82b..f664ea974fe6cbe10e36246a60aabca308eb3fa7 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,4 +1,5 @@ #!/bin/bash +# (c) https://github.com/MontiCore/monticore rm rmi-model-server-*.jar cp ../target/rmi-model-server-*-jar-with-dependencies.jar ./rmi-model-server.jar diff --git a/docs/latex/make.bat b/docs/latex/make.bat index 70ef32e2380e2ba9c0c771dbd8a473bac961f30b..aa1237f42f9de7ffe6e9f1d2a3f4d87cc7ecc0df 100644 --- a/docs/latex/make.bat +++ b/docs/latex/make.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off set GENDIR=target\ diff --git a/install/config.bat b/install/config.bat index 38d10c66c8c00f5146d9a2e29f1b99490c3c6249..5f23ac816bcedac41b3842d8f979b5ff82d3005f 100644 --- a/install/config.bat +++ b/install/config.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @REM Please replace this with the path to the Autopilot(s) set AUTOPILOT_FOLDER=autopilots diff --git a/install/config.sh b/install/config.sh index ea36dc160cab8df5593f2ffdbb06e6e689f589a8..c393b3e8844830dcd3c92418ade3343db5da0c03 100644 --- a/install/config.sh +++ b/install/config.sh @@ -1,4 +1,5 @@ #!/bin/bash +# (c) https://github.com/MontiCore/monticore # Please replace this with the path to the Autopilot(s) diff --git a/install/demo/basic-linux.bat b/install/demo/basic-linux.bat index 2f30531f8c49cd95c8e00bd0f16f03459e1c2cf5..6fedc13906c41b2979d91bf40c5b6183531db11a 100644 --- a/install/demo/basic-linux.bat +++ b/install/demo/basic-linux.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off pushd .. diff --git a/install/demo/basic.bat b/install/demo/basic.bat index 83cfbe2f3bf201726ff26038943864c42c3cff8d..b32b45262ae905b997111cb735fccc3ebc0dabbb 100644 --- a/install/demo/basic.bat +++ b/install/demo/basic.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off pushd .. diff --git a/install/demo/no-cache.bat b/install/demo/no-cache.bat index 97e62035ded4e6bc84af1ff7cd560da0557ba088..6e9fea872349ebf3344fed8614ebe5e2ba162f8e 100644 --- a/install/demo/no-cache.bat +++ b/install/demo/no-cache.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off pushd .. diff --git a/install/demo/no-time.bat b/install/demo/no-time.bat index f59aaebedf5c2d5c89f06685c537d5a6b704ddd5..22b13580f6fd60c9897d6bf2dd2ac1590fdf1dcb 100644 --- a/install/demo/no-time.bat +++ b/install/demo/no-time.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off pushd .. diff --git a/install/demo/slow-cpu.bat b/install/demo/slow-cpu.bat index c819bc57f2a276ae43573229539d3297e3e1cdcc..44a17326868ba29c26a5e968aef8ad9aadcf35ad 100644 --- a/install/demo/slow-cpu.bat +++ b/install/demo/slow-cpu.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off pushd .. diff --git a/install/readme.md b/install/readme.md index 3187367fc53c322cf745cd8512db54ccf1d7ef7d..1b9ebe9277f9f2bbdf5c1ae6a04109482d658d48 100644 --- a/install/readme.md +++ b/install/readme.md @@ -1,3 +1,4 @@ + ## install This folder contains a sample setup of the RMIModelServer using the HardwareEmulator. @@ -7,4 +8,4 @@ This folder is used to perform a simple maven test including the HardwareEmulato Autopilots can be added in the autopilots folder and loaded on the fly using HardwareEmulator configuration. The demo folder contains examples that start the RMIModelServer with a default configuration that is added to -every allocated autopilot. \ No newline at end of file +every allocated autopilot. diff --git a/install/run.bat b/install/run.bat index 5c6c395460a1e9ab4605baaa00c55fa789f805ae..bd99a1d27094bf44e351002a57c2f3049526256d 100644 --- a/install/run.bat +++ b/install/run.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off call config.bat diff --git a/install/run.sh b/install/run.sh index 4007a6192cb553ee36a461802646f75bb7d2e8ec..a0c4940fb0392ced61b61abb187d187149e21bcc 100644 --- a/install/run.sh +++ b/install/run.sh @@ -1,4 +1,5 @@ #!/bin/bash +# (c) https://github.com/MontiCore/monticore source ./config.sh diff --git a/install/run_with_zookeeper.bat b/install/run_with_zookeeper.bat index f57cb5512267d8fad32535803c73bba3b5f19e58..092a273dff6384db1ab6e9f6512ac3148a78918a 100644 --- a/install/run_with_zookeeper.bat +++ b/install/run_with_zookeeper.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore @echo off call config.bat diff --git a/install/run_with_zookeeper.sh b/install/run_with_zookeeper.sh old mode 100755 new mode 100644 index 2e2715be1d79ba69cad51c28c005429721d8cd24..5998a38880d1167b376eff9be19e15f355d34fdf --- a/install/run_with_zookeeper.sh +++ b/install/run_with_zookeeper.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# (c) https://github.com/MontiCore/monticore if [ -z "$1" ]; then diff --git a/license/se/license.txt b/license/se/license.txt index 921acb0959c814eb57a44c5ed9c6900dce03f694..a816360cde86512f696af0884ad36d622ed62dce 100644 --- a/license/se/license.txt +++ b/license/se/license.txt @@ -1,38 +1,6 @@ -==== - ****************************************************************************** - MontiCAR Modeling Family, www.se-rwth.de - Copyright (c) 2017, Software Engineering Group at RWTH Aachen, - All rights reserved. +/* (c) https://github.com/MontiCore/monticore */ - This project is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3.0 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. +The license generally applicable for this project +can be found under https://github.com/MontiCore/monticore. - You should have received a copy of the GNU Lesser General Public - License along with this project. If not, see . - ******************************************************************************* -==== - -****************************************************************************** - MontiCAR Modeling Family, www.se-rwth.de - Copyright (c) 2017, Software Engineering Group at RWTH Aachen, - All rights reserved. - - This project is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3.0 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this project. If not, see . -******************************************************************************* diff --git a/pom.xml b/pom.xml index 8a1c9432d90dc50e8ca7fd13f106aac8be0600a8..2c357f9ec6ca94ca62cf81febbb58b1a03c229b7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,4 @@ - + 4.0.0 @@ -245,4 +224,4 @@ - \ No newline at end of file + diff --git a/scripts/compile_install.bat b/scripts/compile_install.bat index efaddb85611d87a6887fa43ffaccdb6454c4d896..3edfdb12367b4d9b2fd5da34ff0974135dadef66 100644 --- a/scripts/compile_install.bat +++ b/scripts/compile_install.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore pushd %~dp0.. call mvn clean install -s "settings.xml" diff --git a/scripts/compile_install.sh b/scripts/compile_install.sh index fc7f54627d88787d0235af84c4f344c47c4a4cec..8414c85098d70981fc8bf6cd6010f521ab3c9438 100644 --- a/scripts/compile_install.sh +++ b/scripts/compile_install.sh @@ -1,4 +1,5 @@ #!/bin/bash +# (c) https://github.com/MontiCore/monticore cd .. diff --git a/settings.xml b/settings.xml index 46479d0b15b6373eb493ac4959fe9cb32a531164..c0b955ec42adde81c858b03ee259806a9ea2c340 100644 --- a/settings.xml +++ b/settings.xml @@ -1,26 +1,5 @@ - + . -******************************************************************************* diff --git a/src/main/java/rwth/rmi/model/server/RMIServer.java b/src/main/java/rwth/rmi/model/server/RMIServer.java index 756019390cdf7aa30d7532e9d5ce8cce7ceb0a60..a1659f38fc84c3c934cc6b87e294ff05b4319639 100644 --- a/src/main/java/rwth/rmi/model/server/RMIServer.java +++ b/src/main/java/rwth/rmi/model/server/RMIServer.java @@ -1,23 +1,4 @@ -/** - * - * ****************************************************************************** - * MontiCAR Modeling Family, www.se-rwth.de - * Copyright (c) 2017, Software Engineering Group at RWTH Aachen, - * All rights reserved. - * - * This project is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this project. If not, see . - * ******************************************************************************* - */ +/* (c) https://github.com/MontiCore/monticore */ package rwth.rmi.model.server; import org.I0Itec.zkclient.ZkClient; diff --git a/src/main/java/rwth/rmi/model/server/interfaces/RMIManager.java b/src/main/java/rwth/rmi/model/server/interfaces/RMIManager.java index e55983f5f6859332141ad5e73433ba23b2048c67..25f2faea870cfee4cc546a4f6a7072d785171bdb 100644 --- a/src/main/java/rwth/rmi/model/server/interfaces/RMIManager.java +++ b/src/main/java/rwth/rmi/model/server/interfaces/RMIManager.java @@ -1,23 +1,4 @@ -/** - * - * ****************************************************************************** - * MontiCAR Modeling Family, www.se-rwth.de - * Copyright (c) 2017, Software Engineering Group at RWTH Aachen, - * All rights reserved. - * - * This project is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this project. If not, see . - * ******************************************************************************* - */ +/* (c) https://github.com/MontiCore/monticore */ package rwth.rmi.model.server.interfaces; import java.rmi.AlreadyBoundException; diff --git a/src/main/java/simulator/integration/HardwareEmulatorInterface.java b/src/main/java/simulator/integration/HardwareEmulatorInterface.java index b5639d838b45c7f9a3c6e2e961779aa4b6234cef..7e9be3e3631ae2bf3bd08c0f75a5ce92fa06b073 100644 --- a/src/main/java/simulator/integration/HardwareEmulatorInterface.java +++ b/src/main/java/simulator/integration/HardwareEmulatorInterface.java @@ -1,23 +1,4 @@ -/** - * - * ****************************************************************************** - * MontiCAR Modeling Family, www.se-rwth.de - * Copyright (c) 2017, Software Engineering Group at RWTH Aachen, - * All rights reserved. - * - * This project is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this project. If not, see . - * ******************************************************************************* - */ +/* (c) https://github.com/MontiCore/monticore */ package simulator.integration; import java.io.File; diff --git a/src/test/java/simulator/integration/HardwareEmulatorTest.java b/src/test/java/simulator/integration/HardwareEmulatorTest.java index 2aa756c0f680b05cc103cf11ea6f42419a8d187b..cd597eef79c1929f717b352f6b65342088921d9a 100644 --- a/src/test/java/simulator/integration/HardwareEmulatorTest.java +++ b/src/test/java/simulator/integration/HardwareEmulatorTest.java @@ -1,23 +1,4 @@ -/** - * - * ****************************************************************************** - * MontiCAR Modeling Family, www.se-rwth.de - * Copyright (c) 2017, Software Engineering Group at RWTH Aachen, - * All rights reserved. - * - * This project is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this project. If not, see . - * ******************************************************************************* - */ +/* (c) https://github.com/MontiCore/monticore */ package simulator.integration; import org.junit.Test;