From e32a1d5da2196b102db4b9150b1280a4426959f7 Mon Sep 17 00:00:00 2001 From: Bernhard Rumpe Date: Fri, 23 Aug 2019 17:28:03 +0200 Subject: [PATCH] BR-sy --- .gitlab-ci.yml | 1 + .travis.yml | 1 + README.md | 3 +- docker/build.sh | 1 + docs/latex/make.bat | 1 + install/config.bat | 1 + install/config.sh | 1 + install/demo/basic-linux.bat | 1 + install/demo/basic.bat | 1 + install/demo/no-cache.bat | 1 + install/demo/no-time.bat | 1 + install/demo/slow-cpu.bat | 1 + install/readme.md | 3 +- install/run.bat | 1 + install/run.sh | 1 + install/run_with_zookeeper.bat | 1 + install/run_with_zookeeper.sh | 1 + license/se/license.txt | 38 ++----------------- pom.xml | 25 +----------- scripts/compile_install.bat | 1 + scripts/compile_install.sh | 1 + settings.xml | 23 +---------- src/license/se/license.txt | 18 ++------- .../java/rwth/rmi/model/server/RMIServer.java | 21 +--------- .../model/server/interfaces/RMIManager.java | 21 +--------- .../HardwareEmulatorInterface.java | 21 +--------- .../integration/HardwareEmulatorTest.java | 21 +--------- 27 files changed, 34 insertions(+), 177 deletions(-) mode change 100755 => 100644 docker/build.sh mode change 100755 => 100644 install/run_with_zookeeper.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f13ae4..6d9411a 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 14d9656..522051d 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 e2e1444..aaca274 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 5bc44f9..f664ea9 --- 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 70ef32e..aa1237f 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 38d10c6..5f23ac8 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 ea36dc1..c393b3e 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 2f30531..6fedc13 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 83cfbe2..b32b452 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 97e6203..6e9fea8 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 f59aaeb..22b1358 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 c819bc5..44a1732 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 3187367..1b9ebe9 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 5c6c395..bd99a1d 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 4007a61..a0c4940 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 f57cb55..092a273 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 2e2715b..5998a38 --- 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 921acb0..a816360 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 8a1c943..2c357f9 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 efaddb8..3edfdb1 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 fc7f546..8414c85 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 46479d0..c0b955e 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 7560193..a1659f3 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 e55983f..25f2fae 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 b5639d8..7e9be3e 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 2aa756c..cd597ee 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; -- GitLab