diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cf977b3d515ca5ed9c45c1ea8cd9f50177eddbc..8797a01f3ffebf37332f684f0e09a41713e58a78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore image: maven:3-jdk-8 diff --git a/.travis.yml b/.travis.yml index f8eceb5678d9cb97daed4863a5a7d12f7bdc60be..cca69f5b8bafe3a2eb71d22b1e8327a7d17fbd2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore script: - git checkout ${TRAVIS_BRANCH} - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report --settings "settings.xml" diff --git a/README.md b/README.md index 9cba1c07b504c86699d05320e1c3030638844c2e..2fb429e14c4d5b2018f9c2dc04424520526f918f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + # Server ![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/build.svg) ![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/coverage.svg) @@ -384,4 +385,4 @@ Although this smartfox image is currently set to use SQLite as default database, Additionally, if you just need the postgres database and find it complicated to setup, you can use the following command to start a postgres database: ``` $ docker-compose up postgres -d -``` \ No newline at end of file +``` diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index b83cfa1818870422d378d269614f04d72df0923a..8bde8f7197aa176a3a2e8cdb670d353fd9ac2254 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -1,4 +1,5 @@ + montisim diff --git a/docker/World.zone.xml b/docker/World.zone.xml index e64339fd78669f606c766566cf097f21956dd999..aab7cf31ff707ba6e17bc26bf05440c03f79330d 100644 --- a/docker/World.zone.xml +++ b/docker/World.zone.xml @@ -1,3 +1,4 @@ + World false @@ -159,4 +160,4 @@ 3000 true - \ No newline at end of file + diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e5aa1f89925dfb598829ac119884b6ddceabf187..7d7c7d6ece51d221e565e581da465152a20ea583 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore version: "3" services: diff --git a/docs/DBscripts/sqlite-create-script.bat b/docs/DBscripts/sqlite-create-script.bat index 9b7b93121bf76f4374ec020ebf44b9c798a44a72..24ec265ad7419feb93e9e21df49f05d67f4c2ccd 100644 --- a/docs/DBscripts/sqlite-create-script.bat +++ b/docs/DBscripts/sqlite-create-script.bat @@ -1 +1,2 @@ -sqlite3 world.db ".read sqlite-world.sql" \ No newline at end of file +@rem (c) https://github.com/MontiCore/monticore +sqlite3 world.db ".read sqlite-world.sql" diff --git a/docs/DBscripts/sqlite-create-script.sh b/docs/DBscripts/sqlite-create-script.sh old mode 100755 new mode 100644 index aa31591d9e4778292bd7dafd6088dcb748a9a2fc..62b529b2b7be7aeb4fb3cadc629e1e0848f995ae --- a/docs/DBscripts/sqlite-create-script.sh +++ b/docs/DBscripts/sqlite-create-script.sh @@ -1,3 +1,4 @@ #!/bin/bash +# (c) https://github.com/MontiCore/monticore -sqlite3 world_linux.db ".read sqlite-world.sql" \ No newline at end of file +sqlite3 world_linux.db ".read sqlite-world.sql" diff --git a/docs/scripts/deploy.bat b/docs/scripts/deploy.bat index 018813c9f6259c1e43df4684e36716d6b6338b63..75163c4b65d8efa59b74c6b8d048d00f7762a403 100644 --- a/docs/scripts/deploy.bat +++ b/docs/scripts/deploy.bat @@ -1,3 +1,4 @@ +@rem (c) https://github.com/MontiCore/monticore REM Batch script SET CONFIG_DIR=main\resources diff --git a/docs/scripts/deploy.sh b/docs/scripts/deploy.sh old mode 100755 new mode 100644 index f475e0c1b2668f420bb03b7e5ea00842d649924a..0e29e622cb439d0a5339a1712e95b085bbe2caed --- a/docs/scripts/deploy.sh +++ b/docs/scripts/deploy.sh @@ -1,4 +1,5 @@ #!/bin/bash +# (c) https://github.com/MontiCore/monticore CONFIG_DIR="main/resources" CONFIG_FILE="config.properties" @@ -17,4 +18,4 @@ cp -nf $SQLITE_DB $SFS_EXT_DIR/world.db #Change permissions for all extensions chmod -R +x $SFS_EXT_DIR -echo Extensions deployed \(Platform Unix\) \ No newline at end of file +echo Extensions deployed \(Platform Unix\) diff --git a/docs/scripts/recompile_fmu.sh b/docs/scripts/recompile_fmu.sh old mode 100755 new mode 100644 index 2e05145f69fc10407d7560a758994eb1fd74e113..cf249664a42ba5f38ec9545003db74501b7636c3 --- a/docs/scripts/recompile_fmu.sh +++ b/docs/scripts/recompile_fmu.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# (c) https://github.com/MontiCore/monticore # This script re-compile all *.fmu files in the current directory using # current available c++ compiler. This makes the fmu files compatible with diff --git a/main/resources/aachen.sim b/main/resources/aachen.sim index b4b9c497b3adcb7373bc82ecc2653210b8d61a39..0e68119d1ff185a74f1bcd1df2335f044e1001b2 100644 --- a/main/resources/aachen.sim +++ b/main/resources/aachen.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim Aachen { sim_duration 4h; diff --git a/main/resources/aachen2.sim b/main/resources/aachen2.sim index 9be1222c66ecf1b60d0bfc7883764b27c1743b67..c26ce5a5f6261d7be210bea6cf42e7c0497a4b4c 100644 --- a/main/resources/aachen2.sim +++ b/main/resources/aachen2.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim Aachen { sim_duration 4h; diff --git a/pom.xml b/pom.xml index 503f46b0cbed3c58340d54e1c59eaa943ded58ba..376133102b45c7945ae07858addb9150c4c1e271 100644 --- a/pom.xml +++ b/pom.xml @@ -1,25 +1,5 @@ - + diff --git a/restful/README.md b/restful/README.md index 00be6851f04a4c954265dc6f0c11a456e6a9d2b3..985ab12ab2ce0f61a363918ae1bb259b214423dc 100644 --- a/restful/README.md +++ b/restful/README.md @@ -1,3 +1,4 @@ + This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also diff --git a/restful/TestDockerfile b/restful/TestDockerfile index bc9cb6a65674b9990863eaddeb07373464bca432..9557e2ca3b9cf35aabd1c6523631b3b18be61463 100644 --- a/restful/TestDockerfile +++ b/restful/TestDockerfile @@ -6,4 +6,4 @@ COPY . . RUN apt-get update && \ apt-get install -y openjfx && \ cd /app/rpc && \ - mvn install -DskipTests -s ../settings.xml \ No newline at end of file + mvn install -DskipTests -s ../settings.xml diff --git a/restful/build.sh b/restful/build.sh old mode 100755 new mode 100644 index c92f712af2a7e8b7196af5a0c82b29ff6c8422e5..0456e620fea3768db66d8c426619bee004dfb268 --- a/restful/build.sh +++ b/restful/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# (c) https://github.com/MontiCore/monticore cp ./target/classes/app.db app.db cp ./target/restful-2.0.0.jar app.jar diff --git a/restful/dev.yml b/restful/dev.yml index fc7f009aa15d1624934428d72e715cdcd91e47af..a7508b7d9937cf6a7b9c3aa1526be0fe483b0fc2 100644 --- a/restful/dev.yml +++ b/restful/dev.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore version: "3" services: diff --git a/restful/openapi.yml b/restful/openapi.yml index c298d3c27cb010d04b91fabcb1bae3d739de43b0..8927c00d8f15656770e7e608cf6ef8d47cd54d5e 100644 --- a/restful/openapi.yml +++ b/restful/openapi.yml @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore swagger: "2.0" info: description: "API doc for MontiSim server" @@ -471,4 +472,4 @@ definitions: $ref: "#/definitions/DataFrame" externalDocs: description: "MontiSim server" - url: "https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server" \ No newline at end of file + url: "https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server" diff --git a/restful/pom.xml b/restful/pom.xml index 674673f1d8350d2dfe4dc45703305a248654abc8..182954a714aefb6a484f800717dfa997c46bb16e 100644 --- a/restful/pom.xml +++ b/restful/pom.xml @@ -1,4 +1,5 @@ + @@ -237,4 +238,4 @@ https://nexus.se.rwth-aachen.de/content/repositories/embeddedmontiarc-snapshots/ - \ No newline at end of file + diff --git a/restful/run_test.sh b/restful/run_test.sh old mode 100755 new mode 100644 index c01c794d72659e085c2380e9d76f7ef0eef163bf..82da323c3f33558e90c26cda2ee5e7096af7a61b --- a/restful/run_test.sh +++ b/restful/run_test.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# (c) https://github.com/MontiCore/monticore # this script serves the purpose of running unitetests in gitlab-runner. # It starts all dependent services needed before starting the tests. diff --git a/restful/src/main/java/server/restful/Server.java b/restful/src/main/java/server/restful/Server.java index 7da8f8d63d7540d9cfdd257439b723a5a205c44d..19d91f5dfe44208c18e87b0b3cf3d7c77ce55b4a 100644 --- a/restful/src/main/java/server/restful/Server.java +++ b/restful/src/main/java/server/restful/Server.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful; import org.springframework.boot.SpringApplication; diff --git a/restful/src/main/java/server/restful/SwaggerConfig.java b/restful/src/main/java/server/restful/SwaggerConfig.java index 6be1ecf2ba20dd51a12e1e3e01733e00148943ab..3e634d5839a54fe4ae2e21a060bf28c661cd1649 100644 --- a/restful/src/main/java/server/restful/SwaggerConfig.java +++ b/restful/src/main/java/server/restful/SwaggerConfig.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful; import com.google.common.base.Predicates; diff --git a/restful/src/main/java/server/restful/dao/BaseDAO.java b/restful/src/main/java/server/restful/dao/BaseDAO.java index b4a4191f28153b644e164985d7e0284611a3393d..3a87817b49998b5ff2c3b545de1ce03c5ec5950f 100644 --- a/restful/src/main/java/server/restful/dao/BaseDAO.java +++ b/restful/src/main/java/server/restful/dao/BaseDAO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import org.slf4j.Logger; diff --git a/restful/src/main/java/server/restful/dao/MapDAO.java b/restful/src/main/java/server/restful/dao/MapDAO.java index 010c616f2140c5c9e01bf80202a68314ea48fb4c..72c8921f0c68d649c1be00cc279dbfc0013ca656 100644 --- a/restful/src/main/java/server/restful/dao/MapDAO.java +++ b/restful/src/main/java/server/restful/dao/MapDAO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import server.restful.model.MapModel; diff --git a/restful/src/main/java/server/restful/dao/ScenarioDAO.java b/restful/src/main/java/server/restful/dao/ScenarioDAO.java index 2681c1f5e138672d60ca8f23a92b85781aec26dc..06fc38d2f34edcfe8376ecd48c58e001e651ae26 100644 --- a/restful/src/main/java/server/restful/dao/ScenarioDAO.java +++ b/restful/src/main/java/server/restful/dao/ScenarioDAO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import server.restful.model.ScenarioModel; diff --git a/restful/src/main/java/server/restful/dao/SimulationDAO.java b/restful/src/main/java/server/restful/dao/SimulationDAO.java index 022e96501be45179b60aaa34985c0924ded016c1..fb094b13b3b88e7251e23f363cefe12ee3d64a20 100644 --- a/restful/src/main/java/server/restful/dao/SimulationDAO.java +++ b/restful/src/main/java/server/restful/dao/SimulationDAO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/restful/src/main/java/server/restful/graph/MetisGraph.java b/restful/src/main/java/server/restful/graph/MetisGraph.java index 97edbc163cee50b98311cd2720cc14b68f18cfbc..e1fab0267bf4437e39cfb71914977712eada16d5 100644 --- a/restful/src/main/java/server/restful/graph/MetisGraph.java +++ b/restful/src/main/java/server/restful/graph/MetisGraph.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.graph; import commons.controller.commons.Vertex; diff --git a/restful/src/main/java/server/restful/graph/OverlayUtil.java b/restful/src/main/java/server/restful/graph/OverlayUtil.java index 7174793dd2b61d57c2071535646614518101bc66..1b13269d5c600f6fe7b653afd175f8356c940931 100644 --- a/restful/src/main/java/server/restful/graph/OverlayUtil.java +++ b/restful/src/main/java/server/restful/graph/OverlayUtil.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.graph; import commons.controller.commons.Vertex; diff --git a/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java b/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java index 81f3fe50d4fab675a22ad4f654de2b7b3e82dce0..cf007cbf3807227c542ea286a647b08468bd3db0 100644 --- a/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java +++ b/restful/src/main/java/server/restful/graph/structures/OverlayEdge.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.graph.structures; import structures.Edge; diff --git a/restful/src/main/java/server/restful/model/Dataframe.java b/restful/src/main/java/server/restful/model/Dataframe.java index 72793c35e21e6ae7f17eaa70786cb7ef01343630..3f4388e519da4a4ca72003a3caba87e3109e93a7 100644 --- a/restful/src/main/java/server/restful/model/Dataframe.java +++ b/restful/src/main/java/server/restful/model/Dataframe.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.model; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/restful/src/main/java/server/restful/model/MapModel.java b/restful/src/main/java/server/restful/model/MapModel.java index 1c2ce2fd9488d7f2d628c39cd2172b74d4d50b36..1ddcab13f09ddaee0bc18948a0a23bbc84eec8a2 100644 --- a/restful/src/main/java/server/restful/model/MapModel.java +++ b/restful/src/main/java/server/restful/model/MapModel.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.model; diff --git a/restful/src/main/java/server/restful/model/OSMEdge.java b/restful/src/main/java/server/restful/model/OSMEdge.java index eddf60ee19201c77b90d3b926055cb1ecbbc1744..72a9257d036d23fa7024e823cf97d025235a77d6 100644 --- a/restful/src/main/java/server/restful/model/OSMEdge.java +++ b/restful/src/main/java/server/restful/model/OSMEdge.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.model; import commons.controller.commons.Vertex; diff --git a/restful/src/main/java/server/restful/model/ScenarioModel.java b/restful/src/main/java/server/restful/model/ScenarioModel.java index b581eb8cfd6ddac94c3dcc7d928792294fe34895..7996ce979c7b7d807b7e90cf63b41e48d546df02 100644 --- a/restful/src/main/java/server/restful/model/ScenarioModel.java +++ b/restful/src/main/java/server/restful/model/ScenarioModel.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.model; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/restful/src/main/java/server/restful/model/SimulationModel.java b/restful/src/main/java/server/restful/model/SimulationModel.java index e00961f7bc2b360305393166aa484cba0770af5d..e09b197aa1973d116af269270d5ff00c9192249b 100644 --- a/restful/src/main/java/server/restful/model/SimulationModel.java +++ b/restful/src/main/java/server/restful/model/SimulationModel.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.model; diff --git a/restful/src/main/java/server/restful/model/VehicleModel.java b/restful/src/main/java/server/restful/model/VehicleModel.java index e01f483c32e3e1553e4e43394557ca804325586d..31b4cedc201abdc7c6c07338b81d715c5d86d43a 100644 --- a/restful/src/main/java/server/restful/model/VehicleModel.java +++ b/restful/src/main/java/server/restful/model/VehicleModel.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.model; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/restful/src/main/java/server/restful/registry/DefaultRegistry.java b/restful/src/main/java/server/restful/registry/DefaultRegistry.java index 5c4d77164f5a2adff016f63e40d4f026f2d3e8a1..21ce25751f2f515b8cfb31f1a32ff833337601e8 100644 --- a/restful/src/main/java/server/restful/registry/DefaultRegistry.java +++ b/restful/src/main/java/server/restful/registry/DefaultRegistry.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; /** diff --git a/restful/src/main/java/server/restful/registry/RegistryFactory.java b/restful/src/main/java/server/restful/registry/RegistryFactory.java index f6df3207ff6090004c09dbee4ebb1951ed8581c4..d4ca74864e5d714ac095a7d1cb702896d7c1a517 100644 --- a/restful/src/main/java/server/restful/registry/RegistryFactory.java +++ b/restful/src/main/java/server/restful/registry/RegistryFactory.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.I0Itec.zkclient.exception.ZkTimeoutException; diff --git a/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java b/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java index a5ab906737b369302129b9966e9e11cf85d528c9..915d096ce2d49e5196ec72089b130891c028a66a 100644 --- a/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java +++ b/restful/src/main/java/server/restful/registry/RemoteAutopilotService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; public class RemoteAutopilotService extends RemoteService{ diff --git a/restful/src/main/java/server/restful/registry/RemoteService.java b/restful/src/main/java/server/restful/registry/RemoteService.java index e8680bc890540132821a5b2a7948a15e7ffd858a..1db7c700183ee357bd1b6379f764cf02451f8a0b 100644 --- a/restful/src/main/java/server/restful/registry/RemoteService.java +++ b/restful/src/main/java/server/restful/registry/RemoteService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.I0Itec.zkclient.ZkClient; diff --git a/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java b/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java index e9ca4d980f16d8eba7eb1af941d2d26af8e6ab70..f76bc8175e1e26ea1ac11ee971cf07a00d0e0213 100644 --- a/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java +++ b/restful/src/main/java/server/restful/registry/RemoteSimulatorService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import java.util.List; diff --git a/restful/src/main/java/server/restful/registry/ServiceRegistry.java b/restful/src/main/java/server/restful/registry/ServiceRegistry.java index 043e8d215c345e210182398eb2a7a94577d8ba30..1dfc0de5773601d811a923095cff66e5535a564d 100644 --- a/restful/src/main/java/server/restful/registry/ServiceRegistry.java +++ b/restful/src/main/java/server/restful/registry/ServiceRegistry.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; public interface ServiceRegistry { diff --git a/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java b/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java index 9f7b3b83b3da969c69c6a5a25edfdf68704610ab..48c16a10dfb99d23512c11789916fcfa5b2a6c3d 100644 --- a/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java +++ b/restful/src/main/java/server/restful/registry/ZookeeperRegistry.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.I0Itec.zkclient.ZkClient; diff --git a/restful/src/main/java/server/restful/registry/util/Lock.java b/restful/src/main/java/server/restful/registry/util/Lock.java index dc2d8fe59fa104c29a9f20395f86c6ddef3fede6..2ccfaa9408c5a5ddd216abaa0ae1ee50e5a09923 100644 --- a/restful/src/main/java/server/restful/registry/util/Lock.java +++ b/restful/src/main/java/server/restful/registry/util/Lock.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry.util; import org.I0Itec.zkclient.IZkDataListener; diff --git a/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java b/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java index 27aae11421dd5f9c6b344debdc46122fcf9e3839..1be16eb6cd3683666842cecbfac1442dc4dcf119 100644 --- a/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java +++ b/restful/src/main/java/server/restful/registry/util/ZookeeperFactory.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry.util; import org.I0Itec.zkclient.ZkClient; diff --git a/restful/src/main/java/server/restful/service/MapService.java b/restful/src/main/java/server/restful/service/MapService.java index 66bfc3ab74db334e042194b98fd8de5ed91e3bbb..d0e6bad10ac53f3188dc469855d6c8bfbb97c16e 100644 --- a/restful/src/main/java/server/restful/service/MapService.java +++ b/restful/src/main/java/server/restful/service/MapService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import commons.controller.commons.Vertex; diff --git a/restful/src/main/java/server/restful/service/NavigationService.java b/restful/src/main/java/server/restful/service/NavigationService.java index 872b6b5bd350eeffa5bbd7f2e14be5b43f85a6dd..031bd351a4450fd317a9342e935ba97ae7c5a7fa 100644 --- a/restful/src/main/java/server/restful/service/NavigationService.java +++ b/restful/src/main/java/server/restful/service/NavigationService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import commons.controller.commons.Vertex; diff --git a/restful/src/main/java/server/restful/service/ScenarioService.java b/restful/src/main/java/server/restful/service/ScenarioService.java index 9efef005531ce39b60e37ca741858c1bb021f73e..d2c77eb51bf095e2e6a886cb72a3c780dd0dcf59 100644 --- a/restful/src/main/java/server/restful/service/ScenarioService.java +++ b/restful/src/main/java/server/restful/service/ScenarioService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import server.restful.dao.ScenarioDAO; diff --git a/restful/src/main/java/server/restful/service/SimulationService.java b/restful/src/main/java/server/restful/service/SimulationService.java index fe45003f56b71580fe513b8e051d24d2eb462e8d..56b830d3aea3fdba5fe22be5c624d7789ada66ed 100644 --- a/restful/src/main/java/server/restful/service/SimulationService.java +++ b/restful/src/main/java/server/restful/service/SimulationService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import de.monticore.lang.montisim.simlang.SimLangTool; diff --git a/restful/src/main/java/server/restful/service/SimulatorService.java b/restful/src/main/java/server/restful/service/SimulatorService.java index 9378d5a663e75287e44d0fc07db81828ec6e0d71..5ccad5288427b7865a4b1d03e655cce50b071b04 100644 --- a/restful/src/main/java/server/restful/service/SimulatorService.java +++ b/restful/src/main/java/server/restful/service/SimulatorService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import com.google.protobuf.ByteString; diff --git a/restful/src/main/java/server/restful/service/VehicleService.java b/restful/src/main/java/server/restful/service/VehicleService.java index 10d18ead2cb08d1d89218becae23983634dbdc70..796d132cb6dab29b3b30dbb12e406a59bfc3ba1d 100644 --- a/restful/src/main/java/server/restful/service/VehicleService.java +++ b/restful/src/main/java/server/restful/service/VehicleService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import commons.controller.commons.Vertex; diff --git a/restful/src/main/java/server/restful/service/WorldBuilderService.java b/restful/src/main/java/server/restful/service/WorldBuilderService.java index f181c63cd9917f931436e99e781647d92ba2c4f6..bcc856c68050fbd2a10084a023620bc85d32a456 100644 --- a/restful/src/main/java/server/restful/service/WorldBuilderService.java +++ b/restful/src/main/java/server/restful/service/WorldBuilderService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import org.slf4j.Logger; diff --git a/restful/src/main/java/server/restful/util/Util.java b/restful/src/main/java/server/restful/util/Util.java index 0b94230e5928059dca71cb588e68e69ae15c05b9..4d91bf379dae741f0db9610df67b7f416fd85800 100644 --- a/restful/src/main/java/server/restful/util/Util.java +++ b/restful/src/main/java/server/restful/util/Util.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.util; import org.slf4j.Logger; diff --git a/restful/src/main/java/server/restful/view/MapView.java b/restful/src/main/java/server/restful/view/MapView.java index 39009ebcd8088d1385d1770f4d1ee77356816b44..86f5298bbfc2faf7c3864e87bb37a44f946ed704 100644 --- a/restful/src/main/java/server/restful/view/MapView.java +++ b/restful/src/main/java/server/restful/view/MapView.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.springframework.http.HttpStatus; diff --git a/restful/src/main/java/server/restful/view/ScenarioView.java b/restful/src/main/java/server/restful/view/ScenarioView.java index c556090b677c4c556d0d4e1a72e34da5e2f3ab2f..5c42a32cd3bc5d709e26a5e526717cc9b4516943 100644 --- a/restful/src/main/java/server/restful/view/ScenarioView.java +++ b/restful/src/main/java/server/restful/view/ScenarioView.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.springframework.web.bind.annotation.*; diff --git a/restful/src/main/java/server/restful/view/SimulationView.java b/restful/src/main/java/server/restful/view/SimulationView.java index 063f719a4b2d9683180d69d71e78dda9be268520..d4ac583fea896eae07a9ea9eb6f7926629809fcf 100644 --- a/restful/src/main/java/server/restful/view/SimulationView.java +++ b/restful/src/main/java/server/restful/view/SimulationView.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.springframework.http.HttpStatus; diff --git a/restful/src/main/resources/application.properties b/restful/src/main/resources/application.properties index 167d2e4b3714db619daae11120004d1cf336e1f9..297dba6d3c84b9b591db0f831546cfc84ed2061f 100644 --- a/restful/src/main/resources/application.properties +++ b/restful/src/main/resources/application.properties @@ -4,4 +4,4 @@ spring.resources.chain.cache=true # file upload size limit spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-request-size=10MB -server.port=8090 \ No newline at end of file +server.port=8090 diff --git a/restful/src/main/resources/config.properties b/restful/src/main/resources/config.properties index 556013e43d524c5975e96413d549d51df6c2840a..f4cd272a92fe691a793398118c0ccb85075d7d39 100644 --- a/restful/src/main/resources/config.properties +++ b/restful/src/main/resources/config.properties @@ -14,4 +14,4 @@ simulation_step_ms=500 windows_dev_mode=false # define the maximum simulation duration -max_simulation_time_ms=10000 \ No newline at end of file +max_simulation_time_ms=10000 diff --git a/restful/src/main/resources/model.py b/restful/src/main/resources/model.py index 2ea5b5d47bc8ade2d904633f7a46cc79fc5660ea..be298a06149b70a80fd44559a0109209b9f4ddb6 100644 --- a/restful/src/main/resources/model.py +++ b/restful/src/main/resources/model.py @@ -1,3 +1,4 @@ +# (c) https://github.com/MontiCore/monticore from peewee import * db = SqliteDatabase("app.db") diff --git a/restful/src/test/java/server/restful/api/ServerTest.java b/restful/src/test/java/server/restful/api/ServerTest.java index d75e4a4f8e7fda23d397035b58f0f54dc70684c8..277d36f96afefceb604827e5cc2561ec71f10b1e 100644 --- a/restful/src/test/java/server/restful/api/ServerTest.java +++ b/restful/src/test/java/server/restful/api/ServerTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.api; import org.junit.Test; diff --git a/restful/src/test/java/server/restful/dao/MapDAOTest.java b/restful/src/test/java/server/restful/dao/MapDAOTest.java index 51190cb34ba20092ae9f6651ad429744b1ff292e..45f07d56ca3363d6768a6709a0d3177734db3f85 100644 --- a/restful/src/test/java/server/restful/dao/MapDAOTest.java +++ b/restful/src/test/java/server/restful/dao/MapDAOTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import org.junit.Before; @@ -43,4 +44,4 @@ public class MapDAOTest { MapDAO.create("map2.osm", "/new/path/to/map.osm"); assertEquals(3, MapDAO.getAll().size()); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java b/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java index 3ee4980e2b1c0777b722da379213592fbde5a6a0..70bdbf7b25d948428cd0e0f09ca983650b90d83a 100644 --- a/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java +++ b/restful/src/test/java/server/restful/dao/ScenarioDAOTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import org.junit.Before; @@ -34,4 +35,4 @@ public class ScenarioDAOTest { ScenarioDAO.create("sample2.sim", "/path/to/sample.sim"); assertEquals(3, ScenarioDAO.getAll().size()); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/dao/SimulationDAOTest.java b/restful/src/test/java/server/restful/dao/SimulationDAOTest.java index 1a71c16674a9a07e1780d5c04af0af03b762fde2..2a705d053a10937a9dc4ab06520051ec4da132ae 100644 --- a/restful/src/test/java/server/restful/dao/SimulationDAOTest.java +++ b/restful/src/test/java/server/restful/dao/SimulationDAOTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.dao; import org.junit.Before; @@ -85,4 +86,4 @@ public class SimulationDAOTest { assertEquals(frame.getTotalTime(), deserializedResult.getFrames().get(0).getTotalTime(), 1e-5); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/graph/MetisGraphTest.java b/restful/src/test/java/server/restful/graph/MetisGraphTest.java index 458c252ca96578d279afee93cb7766b56195c4c5..666f5ebe773bbd4695a49fcc3ebeebd51c23f546 100644 --- a/restful/src/test/java/server/restful/graph/MetisGraphTest.java +++ b/restful/src/test/java/server/restful/graph/MetisGraphTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.graph; import org.junit.Before; @@ -64,4 +65,4 @@ public class MetisGraphTest { new MetisGraph(graph.getMapPathBySectorIdx(i), -1).init(); } } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/graph/OverlayUtilTest.java b/restful/src/test/java/server/restful/graph/OverlayUtilTest.java index cf4305bc7e0b7403dbbc9518e4649795407bc7fd..8faefa762c3a344dd7a87656ae96b79f06bf884a 100644 --- a/restful/src/test/java/server/restful/graph/OverlayUtilTest.java +++ b/restful/src/test/java/server/restful/graph/OverlayUtilTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.graph; import commons.controller.commons.Vertex; @@ -64,4 +65,4 @@ public class OverlayUtilTest { // graph.sectorize(); OverlayUtil.createOverlayMap(graph.getOriginalGraph(), graph.getOsmIdSectorMapping(), basePath + "/Aachen_6_test.overlay.dot"); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java b/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java index 9b601b80bd24b59c2ba78de026021054f70bcb2f..74f948cf03bc78e2212bf6a144981186847185b9 100644 --- a/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java +++ b/restful/src/test/java/server/restful/registry/DefaultRegistryTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.junit.Test; @@ -17,4 +18,4 @@ public class DefaultRegistryTest { assertEquals("localhost", new DefaultRegistry().getSimulator().getHost()); assertEquals(6000, new DefaultRegistry().getSimulator().getPort()); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java b/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java index 691bdf857bab3184304cd29af520f0193d0c96bd..1eaf74e864e6f79811273ea3314ae6cefcc4c138 100644 --- a/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java +++ b/restful/src/test/java/server/restful/registry/RegistryFactoryTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.junit.Test; @@ -20,4 +21,4 @@ public class RegistryFactoryTest { public void getZookeeperRegistry() { assertTrue(RegistryFactory.getZookeeperRegistry() instanceof ZookeeperRegistry); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java b/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java index 9ca9a2dbde2ffa3dc63acbb52089c60547012f8d..faadb9d2a76a0aefa1eb920cb741a012aaf2b2f0 100644 --- a/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java +++ b/restful/src/test/java/server/restful/registry/RemoteAutopilotServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.I0Itec.zkclient.ZkClient; @@ -61,4 +62,4 @@ public class RemoteAutopilotServiceTest { @Test public void release() { } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java b/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java index 6b6c4b940004e773c8036ff29d5c9de3e01ae2ae..8e9def61081de71a8623009b870fbaf0ff1d85e2 100644 --- a/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java +++ b/restful/src/test/java/server/restful/registry/RemoteSimulatorServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.I0Itec.zkclient.ZkClient; @@ -57,4 +58,4 @@ public class RemoteSimulatorServiceTest { assertEquals(0, zkClient.getChildren(RemoteSimulatorService.OCCUPATION_PATH).size()); assertTrue(svc.isAvailable()); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java b/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java index c8492fe2e39839b60f13ffd36f8ec78e0487263d..bb483730a1b5e2eb3e060dd7c245f0bde65f272e 100644 --- a/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java +++ b/restful/src/test/java/server/restful/registry/ZookeeperRegistryTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry; import org.I0Itec.zkclient.ZkClient; @@ -87,4 +88,4 @@ public class ZookeeperRegistryTest { assertFalse(zkClient.exists( "/simulators/occupied/simulator-201:6000")); assertEquals(0, zkClient.getChildren("/autopilots/busy/autopilot-50:10101").size()); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/registry/util/LockTest.java b/restful/src/test/java/server/restful/registry/util/LockTest.java index 691b112f7ee2d639471843bbd7b68f930b33247f..376824a40c207d885a606a573505ad6e90ca5a68 100644 --- a/restful/src/test/java/server/restful/registry/util/LockTest.java +++ b/restful/src/test/java/server/restful/registry/util/LockTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.registry.util; import org.I0Itec.zkclient.ZkClient; @@ -108,4 +109,4 @@ public class LockTest { assertEquals(0, zk.getChildren("/resource/locks").size()); assertFalse(lock.acquired()); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/service/MapServiceTest.java b/restful/src/test/java/server/restful/service/MapServiceTest.java index 4d07f507d160c71046414b63581446cfebea04c9..75d17e2bfe3c94063cd3f8754dce524befb6ec98 100644 --- a/restful/src/test/java/server/restful/service/MapServiceTest.java +++ b/restful/src/test/java/server/restful/service/MapServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import commons.controller.commons.Vertex; @@ -76,4 +77,4 @@ public class MapServiceTest { assertEquals(0, mapService.getSectorIdxByOsmID(5170132217L)); assertEquals(1, mapService.getSectorIdxByOsmID(5170132468L)); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/service/NavigationServiceTest.java b/restful/src/test/java/server/restful/service/NavigationServiceTest.java index 6d8e51825a3fe3f31e20a57744525aa26f55b8d5..82ceb706b495561d8f3a23fa83f5d249991f8b8b 100644 --- a/restful/src/test/java/server/restful/service/NavigationServiceTest.java +++ b/restful/src/test/java/server/restful/service/NavigationServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import commons.controller.commons.Vertex; @@ -18,4 +19,4 @@ public class NavigationServiceTest { int length = NavigationService.getShortestOverlayPath(g, (Vertex) vertices[0], (Vertex) vertices[2]).getLength(); Assert.assertTrue(length > 0); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/service/SimulationServiceTest.java b/restful/src/test/java/server/restful/service/SimulationServiceTest.java index 5461066f42455375eed6676f4be1c4b18791597b..a898fea91d48e06e7481e016488fea84a3299596 100644 --- a/restful/src/test/java/server/restful/service/SimulationServiceTest.java +++ b/restful/src/test/java/server/restful/service/SimulationServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import junit.framework.TestCase; @@ -37,4 +38,4 @@ public class SimulationServiceTest extends TestCase { Properties prop = Util.getProperties(); assertTrue(prop.size() > 0); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/service/VehicleServiceTest.java b/restful/src/test/java/server/restful/service/VehicleServiceTest.java index 4459ebd4160671f24d45cbcb03db93754c9dd60c..87c49d8d95529e4a65a02977ae871c988c800552 100644 --- a/restful/src/test/java/server/restful/service/VehicleServiceTest.java +++ b/restful/src/test/java/server/restful/service/VehicleServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import commons.controller.commons.Vertex; @@ -73,4 +74,4 @@ public class VehicleServiceTest { } System.out.println("hi"); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java b/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java index 2e9c365b53f734505c42931f6f35c28400e44fcd..323d1c85297bcaa10d32333cf38ec24807540aa9 100644 --- a/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java +++ b/restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.service; import org.junit.Test; @@ -21,4 +22,4 @@ public class WorldBuilderServiceTest { assertTrue(result.getHeightMap().getHeightMapMaxX() != 0); assertTrue(result.getHeightMap().getHeightMapMaxY() != 0); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/view/AbstractViewTest.java b/restful/src/test/java/server/restful/view/AbstractViewTest.java index 5bd1fb5dfc67198ff40597009bee3cbcad22c5b9..cc9069b14d39398e4bfa18e8a1e6bb35b0dfe8dd 100644 --- a/restful/src/test/java/server/restful/view/AbstractViewTest.java +++ b/restful/src/test/java/server/restful/view/AbstractViewTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.junit.Before; diff --git a/restful/src/test/java/server/restful/view/MapViewTest.java b/restful/src/test/java/server/restful/view/MapViewTest.java index 6d4bceb06e94b52b392bc7ec30f318ac52a30c95..533a8eb9c99d43aa02659b7a2b3fc1ee524d0361 100644 --- a/restful/src/test/java/server/restful/view/MapViewTest.java +++ b/restful/src/test/java/server/restful/view/MapViewTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.junit.Assert; @@ -32,4 +33,4 @@ public class MapViewTest extends AbstractViewTest{ Assert.assertEquals(200, result.getResponse().getStatus()); Assert.assertTrue(result.getResponse().getContentAsString().length() > 20); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/view/ScenarioViewTest.java b/restful/src/test/java/server/restful/view/ScenarioViewTest.java index d385646b07173bcb301354cc726cdcc0cea961f1..4f59df353db095ba5a88a9d31efd78068e0005de 100644 --- a/restful/src/test/java/server/restful/view/ScenarioViewTest.java +++ b/restful/src/test/java/server/restful/view/ScenarioViewTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.junit.Assert; @@ -22,4 +23,4 @@ public class ScenarioViewTest extends AbstractViewTest{ Assert.assertEquals(200, result.getResponse().getStatus()); Assert.assertTrue(result.getResponse().getContentAsString().length() > 10); } -} \ No newline at end of file +} diff --git a/restful/src/test/java/server/restful/view/SimulationViewTest.java b/restful/src/test/java/server/restful/view/SimulationViewTest.java index 7769507a7194610b7696c6f28b4745400344c278..fff98cbb140d4970ed7a218cefde25bcf6de2d3d 100644 --- a/restful/src/test/java/server/restful/view/SimulationViewTest.java +++ b/restful/src/test/java/server/restful/view/SimulationViewTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.restful.view; import org.junit.Assert; @@ -22,4 +23,4 @@ public class SimulationViewTest extends AbstractViewTest{ Assert.assertEquals(200, result.getResponse().getStatus()); Assert.assertTrue(result.getResponse().getContentAsString().length() > 10); } -} \ No newline at end of file +} diff --git a/restful/src/test/resources/aachen.sim b/restful/src/test/resources/aachen.sim index 185be5fd125e202302d7ce8263180fec2bca31e6..4dc18c5aa7096e3a095eb6a53c229c80ceaea608 100644 --- a/restful/src/test/resources/aachen.sim +++ b/restful/src/test/resources/aachen.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim Aachen { sim_duration 4h; diff --git a/restful/src/test/resources/log4j.properties b/restful/src/test/resources/log4j.properties index 0d3f9820db0a01147e73157efef905013e669c1c..956fa0081e0a9ff59feddd650a51f40d41eaf9eb 100644 --- a/restful/src/test/resources/log4j.properties +++ b/restful/src/test/resources/log4j.properties @@ -3,4 +3,4 @@ log4j.rootLogger=DEBUG,A1 # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n \ No newline at end of file +log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n diff --git a/restful/src/test/resources/map.osm b/restful/src/test/resources/map.osm index 5b9d8b8cb983b711428852896fcef96d678fe39f..0572639e4838fa143249a6229529e69544240f17 100644 --- a/restful/src/test/resources/map.osm +++ b/restful/src/test/resources/map.osm @@ -1 +1 @@ -testcontent \ No newline at end of file +testcontent diff --git a/restful/src/test/resources/straight.osm b/restful/src/test/resources/straight.osm index 37144ff3d9d82a6084a52d3f012df075b5f539a6..878de6cbdcff0d191a2a206a34104976c84ef8b4 100644 --- a/restful/src/test/resources/straight.osm +++ b/restful/src/test/resources/straight.osm @@ -108,4 +108,4 @@ - \ No newline at end of file + diff --git a/restful/src/test/resources/straight.sim b/restful/src/test/resources/straight.sim index d038d3c98071481a92fa2c5bcd5e5c3c89cb85e7..f0642b6f710e20f922bb6b4a159f30055eaad349 100644 --- a/restful/src/test/resources/straight.sim +++ b/restful/src/test/resources/straight.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim LowFriction { sim_duration 4h; diff --git a/restful/src/test/resources/straight_2_cars.sim b/restful/src/test/resources/straight_2_cars.sim index 1ecbb6af0bbf25841b0b5520902bd35ba2e14382..879997526a6bb21ee62763c95d1d4ff3b55f9666 100644 --- a/restful/src/test/resources/straight_2_cars.sim +++ b/restful/src/test/resources/straight_2_cars.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim LowFriction { sim_duration 4h; diff --git a/restful/src/test/resources/straight_long_distance.sim b/restful/src/test/resources/straight_long_distance.sim index 62ea32735f52bd05a08b17bebd7f74cd8e1fa9bc..db6d576592009739f038c25686509825662b6efa 100644 --- a/restful/src/test/resources/straight_long_distance.sim +++ b/restful/src/test/resources/straight_long_distance.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim LowFriction { sim_duration 4h; diff --git a/rpc/README.md b/rpc/README.md index 34f644aeccee6ae50ffa45bf416cf75f4764b6ed..97f8c4fcd21a5ac65f88982a12e766b7d1eeef6c 100644 --- a/rpc/README.md +++ b/rpc/README.md @@ -1,3 +1,4 @@ + This module implements a gRPC wrapper for MontiSim simulator. ## Install diff --git a/rpc/build.sh b/rpc/build.sh old mode 100755 new mode 100644 index 6d7e7262f683c9f42c42965790c2cdb19160fc27..8f4165f60d9caddbf130e803d8f1c08c6d419807 --- a/rpc/build.sh +++ b/rpc/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# (c) https://github.com/MontiCore/monticore cp ../libs/fmu_for_linux/* ./ cp ./target/rpc-2.0.0-jar-with-dependencies.jar ./simulator-rpc.jar diff --git a/rpc/pom.xml b/rpc/pom.xml index 03ca677483bd6f07410a4af94287f4873621e7a6..8cf6fa483cc01e183dee28dbfa174c8d4a61c2b6 100644 --- a/rpc/pom.xml +++ b/rpc/pom.xml @@ -1,4 +1,5 @@ + @@ -241,4 +242,4 @@ - \ No newline at end of file + diff --git a/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java b/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java index e2a7c5d3c9b42f86bd028a28b21298c86f5f04df..b3ff3be6dec1261edaa59d619c03f41f3414b3af 100644 --- a/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java +++ b/rpc/src/main/java/server/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.adapters.AutoPilot; import commons.controller.commons.BusEntry; @@ -159,4 +160,4 @@ public class AutopilotAdapterAsFunctionBlock implements FunctionBlockInterface { } LOG.debug(sb.toString()); } -} \ No newline at end of file +} diff --git a/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java b/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java index ea17e3ca6d5d465c5ff72e060e2c4b59498503bf..11718907af76c5bd9458aa50abf7a258fa35cab2 100644 --- a/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java +++ b/rpc/src/main/java/server/adapters/interfaces/VehicleModel.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.adapters.interfaces; import java.rmi.Remote; diff --git a/rpc/src/main/java/server/adapters/util/RMIClient.java b/rpc/src/main/java/server/adapters/util/RMIClient.java index 58947738026c3226d5d82799b828bed0a2c45046..607e4dd937bff0ff15c5c20b87b07f94cb0d3626 100644 --- a/rpc/src/main/java/server/adapters/util/RMIClient.java +++ b/rpc/src/main/java/server/adapters/util/RMIClient.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.adapters.util; import org.apache.log4j.Logger; diff --git a/rpc/src/main/java/server/rpc/RegistableService.java b/rpc/src/main/java/server/rpc/RegistableService.java index 0da33a4a0af7c81b8698cba7a5919453d281452f..670ee1044b798ee34baff8d451f8938c97aa75aa 100644 --- a/rpc/src/main/java/server/rpc/RegistableService.java +++ b/rpc/src/main/java/server/rpc/RegistableService.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.rpc; import org.I0Itec.zkclient.ZkClient; diff --git a/rpc/src/main/java/server/rpc/RpcServer.java b/rpc/src/main/java/server/rpc/RpcServer.java index 02a931da5ebe68c63295cc452827a374cbd17b55..424b9ba7bf373c4820964521243bd463516e6a26 100644 --- a/rpc/src/main/java/server/rpc/RpcServer.java +++ b/rpc/src/main/java/server/rpc/RpcServer.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.rpc; import io.grpc.Server; diff --git a/rpc/src/main/java/server/rpc/SimulationControllerImpl.java b/rpc/src/main/java/server/rpc/SimulationControllerImpl.java index 51c9467a04545f275c2e30a04420aa8ad88077c4..5077c2312ae22434761c31052d97f37729197827 100644 --- a/rpc/src/main/java/server/rpc/SimulationControllerImpl.java +++ b/rpc/src/main/java/server/rpc/SimulationControllerImpl.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.rpc; import com.google.protobuf.ByteString; diff --git a/rpc/src/main/java/server/rpc/SimulationObserver.java b/rpc/src/main/java/server/rpc/SimulationObserver.java index d7b249d249966ce72d82fc7f77bfa97e438dbdcc..b94e556ae5ae0c481245704f1ba35decd8b9929d 100644 --- a/rpc/src/main/java/server/rpc/SimulationObserver.java +++ b/rpc/src/main/java/server/rpc/SimulationObserver.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.rpc; import commons.controller.commons.BusEntry; diff --git a/rpc/src/main/java/server/rpc/Utils.java b/rpc/src/main/java/server/rpc/Utils.java index 4d0c734765f6eab457feeb2e2814bdd83743d37d..88887074683bb8e9e1f40fe71cd5606a785f4229 100644 --- a/rpc/src/main/java/server/rpc/Utils.java +++ b/rpc/src/main/java/server/rpc/Utils.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.rpc; import commons.controller.commons.Vertex; diff --git a/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java b/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java index fc4ddfa570710310ab6ba9900cbc95c4a4f4f5a1..a08ef9eafe7b9b8893c5ac95f86bf54f9ee83c0e 100644 --- a/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java +++ b/rpc/src/test/java/server/rpc/SimulationControllerImplTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server.rpc; import io.grpc.inprocess.InProcessChannelBuilder; @@ -161,4 +162,4 @@ public class SimulationControllerImplTest { assertTrue(street.getStreetPavements().length() > 0); } } -} \ No newline at end of file +} diff --git a/rpc/src/test/resources/aachen.osm b/rpc/src/test/resources/aachen.osm index dd4093390836492b8efce828d50ebc412603c2ef..85fb28e81fdd0293ec8db9d9b8b686c0eb56035c 100644 --- a/rpc/src/test/resources/aachen.osm +++ b/rpc/src/test/resources/aachen.osm @@ -4026,4 +4026,4 @@ - \ No newline at end of file + diff --git a/rpc/src/test/resources/log4j.properties b/rpc/src/test/resources/log4j.properties index 0d3f9820db0a01147e73157efef905013e669c1c..956fa0081e0a9ff59feddd650a51f40d41eaf9eb 100644 --- a/rpc/src/test/resources/log4j.properties +++ b/rpc/src/test/resources/log4j.properties @@ -3,4 +3,4 @@ log4j.rootLogger=DEBUG,A1 # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n \ No newline at end of file +log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n diff --git a/settings.xml b/settings.xml index 45866c23812d099c08016248a6b59bebee442046..4f7dc3f09b271e2a92f5e226ff7a3ed621947860 100644 --- a/settings.xml +++ b/settings.xml @@ -1,4 +1,5 @@ + . -******************************************************************************* diff --git a/src/main/java/rwth/server/bo/EnvObjectBO.java b/src/main/java/rwth/server/bo/EnvObjectBO.java index 33696ea90071ddac0b0e64d55846487e4ef285cb..249d1a5ebf7d4fc5ae2778b7f4cf4b6edb8e2eb1 100644 --- a/src/main/java/rwth/server/bo/EnvObjectBO.java +++ b/src/main/java/rwth/server/bo/EnvObjectBO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo; import java.util.List; diff --git a/src/main/java/rwth/server/bo/MapBO.java b/src/main/java/rwth/server/bo/MapBO.java index c436f6a1e3d651cf19766f833f5af192ea21a1ea..39635f02a2463953e1b8bf205b2fecb287bb7479 100644 --- a/src/main/java/rwth/server/bo/MapBO.java +++ b/src/main/java/rwth/server/bo/MapBO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo; import rwth.server.dao.MapDao; diff --git a/src/main/java/rwth/server/bo/ScenarioBO.java b/src/main/java/rwth/server/bo/ScenarioBO.java index 1120048333d9a696fcffe3c9b30db30421abd9c1..c6ef76fa1c8b6e7e12e98dac15c70546b00cb903 100644 --- a/src/main/java/rwth/server/bo/ScenarioBO.java +++ b/src/main/java/rwth/server/bo/ScenarioBO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo; import java.util.List; diff --git a/src/main/java/rwth/server/bo/SectorBO.java b/src/main/java/rwth/server/bo/SectorBO.java index a1a7b3b376bdd5611975be5617df00ad54e8426d..14fd6b43ff957cc2cb75a90d6b0b1d058907c82e 100644 --- a/src/main/java/rwth/server/bo/SectorBO.java +++ b/src/main/java/rwth/server/bo/SectorBO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo; import java.util.HashMap; diff --git a/src/main/java/rwth/server/bo/UsersBO.java b/src/main/java/rwth/server/bo/UsersBO.java index 0730ab285a454b37efe6771d4225b0b3255492b2..132e721031f245a1cdbf831e364f2c79b7fcf758 100644 --- a/src/main/java/rwth/server/bo/UsersBO.java +++ b/src/main/java/rwth/server/bo/UsersBO.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo; import com.smartfoxserver.bitswarm.sessions.ISession; diff --git a/src/main/java/rwth/server/bo/WorldBuilder.java b/src/main/java/rwth/server/bo/WorldBuilder.java index 2e2d18a9cd18bb71e81983262f7eb61151de1ba7..205b32407a343ef7c651f76421f6d3556d0119e1 100644 --- a/src/main/java/rwth/server/bo/WorldBuilder.java +++ b/src/main/java/rwth/server/bo/WorldBuilder.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo; import java.io.InputStream; diff --git a/src/main/java/rwth/server/bo/util/ApiManager.java b/src/main/java/rwth/server/bo/util/ApiManager.java index 0c64d1c5cc1d14ecd2d5df16647d733c43333c7f..2e7f9c1bb2c21a45e01e29ae1ef9a85faa7251f5 100644 --- a/src/main/java/rwth/server/bo/util/ApiManager.java +++ b/src/main/java/rwth/server/bo/util/ApiManager.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo.util; import com.smartfoxserver.v2.api.ISFSApi; diff --git a/src/main/java/rwth/server/bo/util/Logger.java b/src/main/java/rwth/server/bo/util/Logger.java index 5e9530e7047fa9632df412303c5f145f1a8a5f86..362425ab922a193a16a5ed9afa03e1183a6e84d0 100644 --- a/src/main/java/rwth/server/bo/util/Logger.java +++ b/src/main/java/rwth/server/bo/util/Logger.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.bo.util; import com.smartfoxserver.v2.extensions.BaseSFSExtension; diff --git a/src/main/java/rwth/server/dao/AreaDao.java b/src/main/java/rwth/server/dao/AreaDao.java index 9e041402eded7889a8aa1b7d00f6e9e82226b898..c3dc4b328d07555b197c6b20fc83d22574f356da 100644 --- a/src/main/java/rwth/server/dao/AreaDao.java +++ b/src/main/java/rwth/server/dao/AreaDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.SQLException; diff --git a/src/main/java/rwth/server/dao/EnvNodeDao.java b/src/main/java/rwth/server/dao/EnvNodeDao.java index 8a2aa9eb1152288e7fa4168db5ecb6e555e3f96e..d17dbb0d3978f0e87a3c9f064fc7561471e0e24c 100644 --- a/src/main/java/rwth/server/dao/EnvNodeDao.java +++ b/src/main/java/rwth/server/dao/EnvNodeDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.Connection; diff --git a/src/main/java/rwth/server/dao/EnvObjectDao.java b/src/main/java/rwth/server/dao/EnvObjectDao.java index b5f52362eea606a9ca53478b28552a14b7e641b7..5acbf8a3d72946c5cccf0be3afff596eab3fa5c2 100644 --- a/src/main/java/rwth/server/dao/EnvObjectDao.java +++ b/src/main/java/rwth/server/dao/EnvObjectDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.SQLException; diff --git a/src/main/java/rwth/server/dao/HeightDao.java b/src/main/java/rwth/server/dao/HeightDao.java index 045ffa02ca2aac11357373111163a4c22afa6680..4d59642bf05e4139bd28e6cc3b23693383e2f6d1 100644 --- a/src/main/java/rwth/server/dao/HeightDao.java +++ b/src/main/java/rwth/server/dao/HeightDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import com.smartfoxserver.v2.db.IDBManager; diff --git a/src/main/java/rwth/server/dao/MapDao.java b/src/main/java/rwth/server/dao/MapDao.java index 340f984fe6fe54017001bff378e2e29db8d94b1a..222b08614154022aedf33a9b77f8df0eecd161f1 100644 --- a/src/main/java/rwth/server/dao/MapDao.java +++ b/src/main/java/rwth/server/dao/MapDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.SQLException; diff --git a/src/main/java/rwth/server/dao/ScenarioDao.java b/src/main/java/rwth/server/dao/ScenarioDao.java index 3d287688b826828ea3c806ffba96135a9433ba81..52071d205d0680bb384fc035590cd6634756ce0f 100644 --- a/src/main/java/rwth/server/dao/ScenarioDao.java +++ b/src/main/java/rwth/server/dao/ScenarioDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.Connection; diff --git a/src/main/java/rwth/server/dao/SectorDao.java b/src/main/java/rwth/server/dao/SectorDao.java index 3691f02fa2eb61a1b0689f12956cc645540ad0f4..2f466340be041781fef454b0c82acac2ff5b7ac6 100644 --- a/src/main/java/rwth/server/dao/SectorDao.java +++ b/src/main/java/rwth/server/dao/SectorDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.SQLException; diff --git a/src/main/java/rwth/server/dao/StreetDao.java b/src/main/java/rwth/server/dao/StreetDao.java index 1e98c650b936d992112ae72a92b58e10a7babdfe..8e25b7e7f186aecb87f569a762683139a7f0e99a 100644 --- a/src/main/java/rwth/server/dao/StreetDao.java +++ b/src/main/java/rwth/server/dao/StreetDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import com.smartfoxserver.v2.db.IDBManager; diff --git a/src/main/java/rwth/server/dao/UsersDao.java b/src/main/java/rwth/server/dao/UsersDao.java index 87fcd75035957a48d6d4ddb1ad1ae4399c97c978..3b6b095b774a7bf0b496aab9ff034cff196abe79 100644 --- a/src/main/java/rwth/server/dao/UsersDao.java +++ b/src/main/java/rwth/server/dao/UsersDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.SQLException; diff --git a/src/main/java/rwth/server/dao/WaterwayDao.java b/src/main/java/rwth/server/dao/WaterwayDao.java index ab24a07a22c96082dfca7f350e8c223f5da7d05f..eb8922a2807c1c27674ebca79090617c8458728b 100644 --- a/src/main/java/rwth/server/dao/WaterwayDao.java +++ b/src/main/java/rwth/server/dao/WaterwayDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao; import java.sql.SQLException; diff --git a/src/main/java/rwth/server/dao/util/DataAccessUtils.java b/src/main/java/rwth/server/dao/util/DataAccessUtils.java index 93fde7561061bcd12673107bd158c950ee651117..416937b183466fbfa1526eead6cfbb7cc935d269 100644 --- a/src/main/java/rwth/server/dao/util/DataAccessUtils.java +++ b/src/main/java/rwth/server/dao/util/DataAccessUtils.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao.util; import java.sql.Connection; diff --git a/src/main/java/rwth/server/dao/util/DataConverter.java b/src/main/java/rwth/server/dao/util/DataConverter.java index ea79da2a3fec9a2d2c196f9198e269c058ce2cdd..a826ded6e47de69d1e8a29ccc0cd411ff3539d49 100644 --- a/src/main/java/rwth/server/dao/util/DataConverter.java +++ b/src/main/java/rwth/server/dao/util/DataConverter.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.dao.util; public class DataConverter { diff --git a/src/main/java/rwth/server/extensions/RoomExt.java b/src/main/java/rwth/server/extensions/RoomExt.java index 0e6477babaaffacfa41768dc8517e2e0d6835ef1..942f4ebe08306bbaa69827d75afa53cee2235924 100644 --- a/src/main/java/rwth/server/extensions/RoomExt.java +++ b/src/main/java/rwth/server/extensions/RoomExt.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.extensions; import java.util.ArrayList; diff --git a/src/main/java/rwth/server/extensions/ZoneExt.java b/src/main/java/rwth/server/extensions/ZoneExt.java index 907e0a33a7b9e985d0b3fb6e7b7fd8d8a08e0c7d..24b9155de6bcd984ada7acc7c4a1d06b282f2b57 100644 --- a/src/main/java/rwth/server/extensions/ZoneExt.java +++ b/src/main/java/rwth/server/extensions/ZoneExt.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.extensions; import java.util.ArrayList; diff --git a/src/main/java/rwth/server/pathfinder/NavigationPath.java b/src/main/java/rwth/server/pathfinder/NavigationPath.java index 6e8e014341552f8c79b58ac3c6129aa8f2f12496..aa0f1d09e33d81bb8adfdeca63db402da48ffb10 100644 --- a/src/main/java/rwth/server/pathfinder/NavigationPath.java +++ b/src/main/java/rwth/server/pathfinder/NavigationPath.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pathfinder; public class NavigationPath { diff --git a/src/main/java/rwth/server/pathfinder/PathDao.java b/src/main/java/rwth/server/pathfinder/PathDao.java index b735adbceb2f9904a1d9c31e925c50e06f5928b8..e6de066a0478398426d52297a8e6efb600a7473f 100644 --- a/src/main/java/rwth/server/pathfinder/PathDao.java +++ b/src/main/java/rwth/server/pathfinder/PathDao.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pathfinder; import java.sql.Connection; diff --git a/src/main/java/rwth/server/pathfinder/PathFinder.java b/src/main/java/rwth/server/pathfinder/PathFinder.java index 022517f7e0045cce9fb30b2ff8cc7811888e901b..62e3fb027b73d61fe1f65fd92e4e054a684f57b7 100644 --- a/src/main/java/rwth/server/pathfinder/PathFinder.java +++ b/src/main/java/rwth/server/pathfinder/PathFinder.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pathfinder; import java.sql.Connection; diff --git a/src/main/java/rwth/server/pojo/MapArea.java b/src/main/java/rwth/server/pojo/MapArea.java index d7c627ca4f0ea043bbf183faf783cbeba9cf2c8a..e2381397e39ad791d8f39af5d4ba994c181d6d52 100644 --- a/src/main/java/rwth/server/pojo/MapArea.java +++ b/src/main/java/rwth/server/pojo/MapArea.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pojo; import com.smartfoxserver.v2.entities.data.ISFSObject; @@ -170,4 +171,4 @@ public class MapArea { this.id = id; } -} \ No newline at end of file +} diff --git a/src/main/java/rwth/server/pojo/MapSector.java b/src/main/java/rwth/server/pojo/MapSector.java index f00788873ef774797a0a3e4993d3adc499215242..f3754983c8eec966ec0a36f31f3185b4b5334ebb 100644 --- a/src/main/java/rwth/server/pojo/MapSector.java +++ b/src/main/java/rwth/server/pojo/MapSector.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pojo; import java.util.HashMap; diff --git a/src/main/java/rwth/server/pojo/ScenarioTrack.java b/src/main/java/rwth/server/pojo/ScenarioTrack.java index 6343f1671c51c91f208253836334ebd7093f5954..fefce272298108c4222c80ea07580b4018602905 100644 --- a/src/main/java/rwth/server/pojo/ScenarioTrack.java +++ b/src/main/java/rwth/server/pojo/ScenarioTrack.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pojo; import java.util.List; @@ -52,4 +53,4 @@ public class ScenarioTrack { public void setSections(List sections) { this.sections = sections; } -} \ No newline at end of file +} diff --git a/src/main/java/rwth/server/pojo/SimulationScenario.java b/src/main/java/rwth/server/pojo/SimulationScenario.java index 3dbd0d304aa4b11fa26b2ae89cedd6fad680f89c..e3bd2fbf14fc9008866e470b0e93ef45cd8dfd9c 100644 --- a/src/main/java/rwth/server/pojo/SimulationScenario.java +++ b/src/main/java/rwth/server/pojo/SimulationScenario.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.pojo; import java.util.List; diff --git a/src/main/java/rwth/server/simulation/Car.java b/src/main/java/rwth/server/simulation/Car.java index 5f5297b45e98e320e96d1817b08eaf2399691093..e9dd4d46c8cb22dc5f7b0a445c81c73dd640f5c8 100644 --- a/src/main/java/rwth/server/simulation/Car.java +++ b/src/main/java/rwth/server/simulation/Car.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import org.apache.commons.math3.linear.RealMatrix; diff --git a/src/main/java/rwth/server/simulation/ConversionUtils.java b/src/main/java/rwth/server/simulation/ConversionUtils.java index 3b61acc7020de77ffa3d07d8b092f4e97657a4f9..3434ea99ec68f997fa1033b3b36feea1d25e4cae 100644 --- a/src/main/java/rwth/server/simulation/ConversionUtils.java +++ b/src/main/java/rwth/server/simulation/ConversionUtils.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import java.util.ArrayList; diff --git a/src/main/java/rwth/server/simulation/FrameData.java b/src/main/java/rwth/server/simulation/FrameData.java index 0f85631e9469a97b4ba9aad0b2a5a8aae42ac718..63e8ad1f8183692b15cd3ddf7ff47220806a9a77 100644 --- a/src/main/java/rwth/server/simulation/FrameData.java +++ b/src/main/java/rwth/server/simulation/FrameData.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import java.util.ArrayList; diff --git a/src/main/java/rwth/server/simulation/SimVehicle.java b/src/main/java/rwth/server/simulation/SimVehicle.java index a501ecd3e2e8deb339e062a2e27d2870742fa596..c9b2cc26e5bb4d42dbf77e733c8ad39b8fdea43a 100644 --- a/src/main/java/rwth/server/simulation/SimVehicle.java +++ b/src/main/java/rwth/server/simulation/SimVehicle.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import rwth.server.pojo.ScenarioTrack; diff --git a/src/main/java/rwth/server/simulation/SimulationBuffer.java b/src/main/java/rwth/server/simulation/SimulationBuffer.java index 835cf5dbfae4955b8d2c762e92f04aa64de5a07b..a291656b3d77816732c4fb9994546cc38f126952 100644 --- a/src/main/java/rwth/server/simulation/SimulationBuffer.java +++ b/src/main/java/rwth/server/simulation/SimulationBuffer.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import java.util.Date; diff --git a/src/main/java/rwth/server/simulation/SimulationController.java b/src/main/java/rwth/server/simulation/SimulationController.java index b55346fba5d5dba5c30c30a21f1a53387c706ff0..ee2dd4a8366919619402476b41d28b538c9171a9 100644 --- a/src/main/java/rwth/server/simulation/SimulationController.java +++ b/src/main/java/rwth/server/simulation/SimulationController.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import commons.controller.commons.Vertex; diff --git a/src/main/java/rwth/server/simulation/StaticBoxObject.java b/src/main/java/rwth/server/simulation/StaticBoxObject.java index 9e6992a34b0dfc70251f3f8edca1afea0a4edf19..9eef17cd0349c497129549ac0e8d9f379c16272c 100644 --- a/src/main/java/rwth/server/simulation/StaticBoxObject.java +++ b/src/main/java/rwth/server/simulation/StaticBoxObject.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation; import commons.simulation.PhysicalObject; diff --git a/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java b/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java index 0b3ce9dcb60f1b29e431e865a17260ed6f6983df..a5933f2d9243e3aaa19bd217f7d35c89c98a403b 100644 --- a/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java +++ b/src/main/java/rwth/server/simulation/adapters/AutoPilot/AutopilotAdapterAsFunctionBlock.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation.adapters.AutoPilot; import java.io.Serializable; @@ -160,4 +161,4 @@ public class AutopilotAdapterAsFunctionBlock implements FunctionBlockInterface { } LOG.debug(sb.toString()); } -} \ No newline at end of file +} diff --git a/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java b/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java index 0eb731b2c333dc1257d53757a28f025c2ef5d046..063b206efd608d402ca846d5f2fbc1880b7ff00b 100644 --- a/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java +++ b/src/main/java/rwth/server/simulation/adapters/interfaces/VehicleModel.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation.adapters.interfaces; import java.rmi.Remote; diff --git a/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java b/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java index 73e6eefd657a59e444545c8d7ad625604f7fe164..045b5e3578216a17966ba04dd7140f12e464e037 100644 --- a/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java +++ b/src/main/java/rwth/server/simulation/adapters/util/RMIClient.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.simulation.adapters.util; import java.io.Serializable; diff --git a/src/main/java/rwth/server/upload/ScenarioUpload.java b/src/main/java/rwth/server/upload/ScenarioUpload.java index 8a8643f782c5635da8e81a2ef126f3fa52c9d303..0fdd5c0013efdfc37837a7a7797c12a22cdad79b 100644 --- a/src/main/java/rwth/server/upload/ScenarioUpload.java +++ b/src/main/java/rwth/server/upload/ScenarioUpload.java @@ -1,22 +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.server.upload; import java.io.File; diff --git a/src/main/java/rwth/server/zone/handlers/LoginHandler.java b/src/main/java/rwth/server/zone/handlers/LoginHandler.java index 534e648f2a9278555e80de4a492c724222ac3984..589e933239eca1c9331d2c9499cc7dbcde0356a5 100644 --- a/src/main/java/rwth/server/zone/handlers/LoginHandler.java +++ b/src/main/java/rwth/server/zone/handlers/LoginHandler.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.zone.handlers; import com.smartfoxserver.bitswarm.sessions.ISession; @@ -36,4 +37,4 @@ public class LoginHandler extends BaseServerEventHandler { } } -} \ No newline at end of file +} diff --git a/src/test/java/rwth/server/extensions/ZoneExtTest.java b/src/test/java/rwth/server/extensions/ZoneExtTest.java index cb15ed14c7f1e1b556321934da76df2f7e9a79ab..567f69c750352482febade07fae149f087e3e8e6 100644 --- a/src/test/java/rwth/server/extensions/ZoneExtTest.java +++ b/src/test/java/rwth/server/extensions/ZoneExtTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.extensions; import org.junit.Test; @@ -9,4 +10,4 @@ public class ZoneExtTest { @Test public void init() { } -} \ No newline at end of file +} diff --git a/src/test/java/rwth/server/upload/ScenarioUploadTest.java b/src/test/java/rwth/server/upload/ScenarioUploadTest.java index eef7ca500572c494cb15eade4c577a36932d068f..cf33671bfa6f33f9925b64bf0a4e54f0ebd49d1b 100644 --- a/src/test/java/rwth/server/upload/ScenarioUploadTest.java +++ b/src/test/java/rwth/server/upload/ScenarioUploadTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package rwth.server.upload; import com.smartfoxserver.v2.db.DBConfig; diff --git a/src/test/java/server/PojoTest.java b/src/test/java/server/PojoTest.java index 0aece9c1b0186978eb53f9249c5cffaf1a24cec8..716212f39d371388cec7012aaefdc8ec6b796eb9 100644 --- a/src/test/java/server/PojoTest.java +++ b/src/test/java/server/PojoTest.java @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ package server; import java.util.Arrays; diff --git a/src/test/resources/Aachen.sim b/src/test/resources/Aachen.sim index b4b9c497b3adcb7373bc82ecc2653210b8d61a39..0e68119d1ff185a74f1bcd1df2335f044e1001b2 100644 --- a/src/test/resources/Aachen.sim +++ b/src/test/resources/Aachen.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim Aachen { sim_duration 4h; diff --git a/src/test/resources/Hamburg.sim b/src/test/resources/Hamburg.sim index 95cd88a28186a72d34deee102e86dfd80c1b4dfe..16959cd606eb7181742ca9341a09a37f05c8ab08 100644 --- a/src/test/resources/Hamburg.sim +++ b/src/test/resources/Hamburg.sim @@ -1,3 +1,4 @@ +/* (c) https://github.com/MontiCore/monticore */ sim Aachen { sim_duration 4h;