Commit 3b36c6ef authored by Robert Meyer's avatar Robert Meyer

Merge branch 'commons-update' into e/e-infrastructure

parents 48dd9ba8 0b5bf965
Pipeline #186818 failed with stage
in 44 seconds
/target/*
**/target/*
.settings/*
.project
.classpath
......@@ -8,4 +8,7 @@
/target
*.pyc
*.DS_Store
*.iml
/restful/src/main/resources/resources
*.jar
/bin/
#
# ******************************************************************************
# 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.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this project. If not, see <http://www.gnu.org/licenses/>.
# *******************************************************************************
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
image: maven:3-jdk-8
stages:
......@@ -37,40 +25,64 @@ stages:
# only:
# - master
masterJobWindows:
masterJobWindowsRpc:
stage: windows
script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml
- cd rpc
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings ..\settings.xml
tags:
- Windows10
only:
- master
#branchJobWindows:
# stage: windows
# script:
# - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
# tags:
# - Windows10
# except:
# - master
BranchJobLinux:
tags:
- docker
stage: linux
image: maven:3-jdk-8
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
masterJobWindowsRestful:
stage: windows
script:
# - apt-get update
# - apt-get install -y openjfx
- cd restful
- ./run_test.sh
# - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
# - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:latest
# - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
# - docker push $CI_REGISTRY_IMAGE:latest
# - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
# TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings ..\settings.xml -DskipTests
tags:
- Windows10
only:
- master
branchJobWindowsRpc:
stage: windows
script:
- cd rpc
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings ..\settings.xml
tags:
- Windows10
except:
- master
branchJobWindowsRestful:
stage: windows
script:
- cd restful
# TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings ..\settings.xml -DskipTests
tags:
- Windows10
except:
- master
#BranchJobLinux:
# tags:
# - docker
# stage: linux
# image: maven:3-jdk-8
# before_script:
# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# script:
## - apt-get update
## - apt-get install -y openjfx
# - cd restful
# - ./run_test.sh
## - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
## - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:latest
## - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
## - docker push $CI_REGISTRY_IMAGE:latest
# # - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
# except:
# - master
......@@ -27,17 +27,15 @@ or download the project as a [.zip file](https://github.com/MontiSim/server/arch
__NOTE:__ _MontiSim_ is the directory, in which MontiSim-belonging projects should be clonned. It has to be manually created.
Additionally [RMIModelServer](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/RMIModelServer) repository has to be cloned, in order to be used and to allow integration of external vehicle autopilot models. This can be done via the following commands:
The [RMIModelServer repository](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/RMIModelServer) has to be cloned and compiled to allow the integration of external vehicle autopilot models (*EMADL models*). This can be done via the following commands:
cd MontiSim
git clone https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/RMIModelServer.git
cd ./RMIModelServer
./scripts/compile_install.bat or ./scripts/compile_install.sh
mvn clean install -s settings.xml
The RMIModelServer uses the [HardwareEmulator](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/hardware_emulator) project to run the autopilots.
A pre-compiled version of the HardwareEmulator is contained in the `install` folder of the RMI server.
The install folder also contains a `run.bat` / `run.sh` script that starts the RMI server within the install folder and uses the `autopilots` folder it contains to load autopilots.
The install folder has to be updated if a new version of the _HardwareEmulator_ is used.
The RMIModelServer is exported to the `install` folder.
It contains a `run.bat` / `run.sh` script that starts the RMI server within the install folder and uses the `autopilots` folder it contains to load autopilots.
To use an external vehicle autopilot, one has to clone the corresponding repository. For the _Autopilot emam_ vehicle model, located in [Autopilot emam repository](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/EMAM-showcase), the following commands have to be executed:
......@@ -384,4 +382,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
```
<!--
(c) https://github.com/MontiCore/monticore
The license generally applicable for this project
can be found under https://github.com/MontiCore/monticore.
-->
<zone>
<name>World</name>
<isCustomLogin>false</isCustomLogin>
......@@ -159,4 +167,4 @@
<blockTime>3000</blockTime>
</databaseManager>
<allowUploads>true</allowUploads>
</zone>
\ No newline at end of file
</zone>
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
version: "3"
services:
......
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
FROM postgres:latest
COPY ./db-create-script.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
--
-- (c) https://github.com/MontiCore/monticore
--
-- The license generally applicable for this project
-- can be found under https://github.com/MontiCore/monticore.
--
--
-- PostgreSQL database dump
--
......
sqlite3 world.db ".read sqlite-world.sql"
\ No newline at end of file
@REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
sqlite3 world.db ".read sqlite-world.sql"
#!/bin/bash
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under 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"
--
-- (c) https://github.com/MontiCore/monticore
--
-- The license generally applicable for this project
-- can be found under https://github.com/MontiCore/monticore.
--
CREATE TABLE area (
id integer NOT NULL PRIMARY KEY AUTOINCREMENT,
minx double precision NOT NULL,
......
--
-- (c) https://github.com/MontiCore/monticore
--
-- The license generally applicable for this project
-- can be found under https://github.com/MontiCore/monticore.
--
This diff is collapsed.
\newcommand{\etalchar}[1]{$^{#1}$}
\begin{thebibliography}{BKRW17}
\bibitem[AKP05]{DBLP:journals/aes/AmbrozKP05}
Miha Ambroz, S.~Krasna, and Ivan Prebil.
\newblock 3d road traffic situation simulation system.
\newblock {\em Advances in Engineering Software}, 36(2):77--86, 2005.
\bibitem[AT05]{DAfMMO-RPG}
Marios Assiotis and Velin Tzanov.
\newblock A distributed architecture for massive multiplayer online
role-playing games.
\newblock May 2005.
\bibitem[BKRW17]{BKRW17a}
Arvid Butting, Oliver Kautz, Bernhard Rumpe, and Andreas Wortmann.
\newblock {Architectural Programming with MontiArcAutomaton}.
\newblock In {\em In 12th International Conference on Software Engineering
Advances (ICSEA 2017)}, pages 213--218. IARIA XPS Press, May 2017.
\bibitem[BR14]{DBLP:journals/corr/0001R14a}
Christian Berger and Bernhard Rumpe.
\newblock Engineering autonomous driving software.
\newblock {\em CoRR}, abs/1409.6579, 2014.
\bibitem[CKSW02]{Caltagirone:2002:AMM:771322.771339}
Sergio Caltagirone, Matthew Keys, Bryan Schlief, and Mary~Jane Willshire.
\newblock Architecture for a massively multiplayer online role playing game
engine.
\newblock {\em J. Comput. Sci. Coll.}, 18(2):105--116, December 2002.
\bibitem[Coz15]{Cozzi15}
Patrick Cozzi.
\newblock {\em {W}eb{GL} {I}nsights}.
\newblock CRC Press, July 2015.
\newblock \url{http://www.webglinsights.com/}.
\bibitem[DBL04]{DBLP:conf/infocom/2004}
{\em Proceedings {IEEE} {INFOCOM} 2004, The 23rd Annual Joint Conference of the
{IEEE} Computer and Communications Societies, Hong Kong, China, March 7-11,
2004}. {IEEE}, 2004.
\bibitem[Dij82]{DBLP:books/daglib/0067388}
Edsger~W. Dijkstra.
\newblock {\em Selected Writings on Computing: {A} Personal Perspective}.
\newblock Texts and Monographs in Computer Science. Springer, 1982.
\bibitem[Dir14]{dirksen2014three}
J.~Dirksen.
\newblock {\em Three.js Essentials}.
\newblock Community experience distilled. Packt Publishing, 2014.
\bibitem[DS07]{DBLP:conf/ijcai/DresnerS07}
Kurt~M. Dresner and Peter Stone.
\newblock Sharing the road: Autonomous vehicles meet human drivers.
\newblock In {\em {IJCAI} 2007, Proceedings of the 20th International Joint
Conference on Artificial Intelligence, Hyderabad, India, January 6-12, 2007},
pages 1263--1268, 2007.
\bibitem[Ecl]{Jetty}
Eclipse.
\newblock {\em Jetty Web-server}.
\bibitem[FM11]{fette2011websocket}
I.~Fette and A.~Melnikov.
\newblock The websocket protocol.
\newblock RFC 6455, RFC Editor, December 2011.
\newblock \url{http://www.rfc-editor.org/rfc/rfc6455.txt}.
\bibitem[For04]{DBLP:reference/cg/Fortune04}
Steven Fortune.
\newblock Voronoi diagrams and delaunay triangulations.
\newblock In {\em Handbook of Discrete and Computational Geometry, Second
Edition.}, pages 513--528. 2004.
\bibitem[Fow03]{fowler2003patterns}
Martin Fowler.
\newblock {\em Patterns of enterprise application architecture}.
\newblock Addison-Wesley, Boston, 2003.
\bibitem[FWW02]{DBLP:conf/netgames/FiedlerWW02}
Stefan~A. Fiedler, Michael Wallner, and Michael Weber.
\newblock A communication architecture for massive multiplayer games.
\newblock In {\em Proceedings of the 1st Workshop on Network and System Support
for Games, {NETGAMES} 2002, Braunschweig, Germany, April 16-17, 2002, 2003},
pages 14--22, 2002.
\bibitem[Gam95]{gamma1995design}
Erich Gamma.
\newblock {\em Design patterns : elements of reusable object-oriented
software}.
\newblock Addison-Wesley, Reading, Mass, 1995.
\bibitem[GD98]{DBLP:conf/icmcs/GautierD98}
Laurent Gautier and Christophe Diot.
\newblock Design and evaluation of mimaze, a multi-player game on the internet.
\newblock In {\em {IEEE} International Conference on Multimedia Computing and
Systems, {ICMCS} 1998, Austin, Texas, USA, June 28 - July 1, 1998}, pages
233--236, 1998.
\bibitem[got]{SFS}
gotoAndPlay().
\newblock {\em SmartFox Server 2X}.
\bibitem[GVM{\etalchar{+}}10]{DBLP:journals/tits/GlaserVMGN10}
Sebastien Glaser, Benoit Vanholme, Sa{\"{\i}}d Mammar, Dominique Gruyer, and
Lydie Nouveliere.
\newblock Maneuver-based trajectory planning for highly autonomous vehicles on
real road with traffic and driver interaction.
\newblock {\em {IEEE} Trans. Intelligent Transportation Systems},
11(3):589--606, 2010.
\bibitem[HPS09]{DBLP:books/daglib/0021734}
George~T. Heineman, Gary Pollice, and Stanley~M. Selkow.
\newblock {\em Algorithms in a nutshell - a desktop quick reference}.
\newblock O'Reilly, 2009.
\bibitem[KCC{\etalchar{+}}05]{DBLP:conf/netgames/KimCCKCY05}
Jaecheol Kim, Jaeyoung Choi, Dukhyun Chang, Taekyoung Kwon, Yanghee Choi, and
Eungsu Yuk.
\newblock Traffic characteristics of a massively multi-player online role
playing game.
\newblock In {\em Proceedings of the 4th Workshop on Network and System Support
for Games, {NETGAMES} 2005, Hawthorne, New York, USA, October 10-11, 2005},
pages 1--8, 2005.
\bibitem[LKC05]{DBLP:journals/cn/LeeKC05}
Kang{-}Won Lee, Bong{-}Jun Ko, and Seraphin~B. Calo.
\newblock Adaptive server selection for large scale interactive online games.
\newblock {\em Computer Networks}, 49(1):84--102, 2005.
\bibitem[MG04]{DBLP:conf/gi/MullerG04}
Jens M{\"{u}}ller and Sergei Gorlatch.
\newblock A scalable architecture for multiplayer computer games.
\newblock In {\em {INFORMATIK} 2004 - Informatik verbindet, Band 1,
Beitr{\"{a}}ge der 34. Jahrestagung der Gesellschaft f{\"{u}}r Informatik
e.V. (GI), Ulm, 20.-24. September 2004}, pages 154--158, 2004.
\bibitem[NSLL02]{DBLP:conf/vrst/NgSLL02}
Beatrice Ng, Antonio Si, Rynson W.~H. Lau, and Frederick W.~B. Li.
\newblock A multi-server architecture for distributed virtual walkthrough.
\newblock In {\em Proceedings of the {ACM} Symposium on Virtual Reality
Software and Technology, {VRST} 2002, Hong Kong, China, November 11-13,
2002}, pages 163--170, 2002.
\bibitem[Pos]{PGSQL}
PostgreSQL.
\newblock {\em PostgreSQL}.
\bibitem[Pun09]{puntambekar2009data}
A.A. Puntambekar.
\newblock {\em Data Structures And Algorithms}.
\newblock Technical Publications, 2009.
\bibitem[RBL{\etalchar{+}}08]{DBLP:journals/jfr/RauskolbBLMCEFGOSWHNDHMWBBGKR08}
Fred~W. Rauskolb, Kai Berger, Christian Lipski, Marcus~A. Magnor, Karsten
Cornelsen, Jan Effertz, Thomas Form, Fabian Graefe, Sebastian Ohl, Walter
Schumacher, J{\"{o}}rn{-}Marten Wille, Peter Hecker, Tobias Nothdurft,
Michael Doering, Kai Homeier, Johannes Morgenroth, Lars~C. Wolf, Christian
Basarke, Christian Berger, Tim G{\"{u}}lke, Felix Klose, and Bernhard Rumpe.
\newblock Caroline: An autonomously driving vehicle for urban environments.
\newblock {\em J. Field Robotics}, 25(9):674--724, 2008.
\bibitem[Ree00]{DBLP:books/daglib/0002204}
George Reese.
\newblock {\em Database programming with {JDBC} and Java {(2.} ed.)}.
\newblock O'Reilly, 2000.
\bibitem[sto]{STOMP}
stomp.
\newblock {\em Simple (or Streaming) Text Orientated Messaging Protocol}.
\bibitem[TMD07]{TaylorEtAl2007}
Richard~N. Taylor, Nenad Medvidovic, and Eric~M. Dashofy.
\newblock {\em Software Architecture: Foundations, Theory and Practice}.
\newblock Addison-Wesley, 2007.
\bibitem[TW11]{DBLP:books/lib/TanenbaumW11}
Andrew~S. Tanenbaum and David Wetherall.
\newblock {\em Computer networks, 5th Edition}.
\newblock Pearson, 2011.
\bibitem[UAB{\etalchar{+}}08]{DBLP:journals/jfr/UrmsonABBBCDDGGGHHHKKLMMPPRRSSSSSWWZBBDLNSZSTDF08}
Chris Urmson, Joshua Anhalt, Drew Bagnell, Christopher~R. Baker, Robert
Bittner, M.~N. Clark, John~M. Dolan, Dave Duggins, Tugrul Galatali,
Christopher Geyer, Michele Gittleman, Sam Harbaugh, Martial Hebert, Thomas~M.
Howard, Sascha Kolski, Alonzo Kelly, Maxim Likhachev, Matthew McNaughton,
Nick Miller, Kevin~M. Peterson, Brian Pilnick, Raj Rajkumar, Paul~E. Rybski,
Bryan Salesky, Young{-}Woo Seo, Sanjiv Singh, Jarrod~M. Snider, Anthony
Stentz, William Whittaker, Ziv Wolkowicki, Jason Ziglar, Hong Bae, Thomas
Brown, Daniel Demitrish, Bakhtiar Litkouhi, Jim Nickolaou, Varsha Sadekar,
Wende Zhang, Joshua Struble, Michael Taylor, Michael Darms, and Dave
Ferguson.
\newblock Autonomous driving in urban environments: Boss and the urban
challenge.
\newblock {\em J. Field Robotics}, 25(8):425--466, 2008.
\bibitem[Wal15]{walls2015spring}
Craig Walls.
\newblock {\em Spring in action}.
\newblock Manning Publications, Shelter Island, N.Y, 2015.
\end{thebibliography}
This is BibTeX, Version 0.99d (TeX Live 2016/Debian)
Capacity: max_strings=100000, hash_size=100000, hash_prime=85009
The top-level auxiliary file: ./Masterarbeit.aux
The style file: alpha.bst
Database file #1: src/bib/Literatur.bib
Warning--to sort, need editor, organization, or key in DBLP:conf/infocom/2004
Warning--empty booktitle in DAfMMO-RPG
Warning--empty publisher in DBLP:reference/cg/Fortune04
You've used 33 entries,
2543 wiz_defined-function locations,
756 strings with 11529 characters,
and the built_in function-call counts, 14387 in all, are:
= -- 1362
> -- 843
< -- 18
+ -- 308
- -- 303
* -- 1075
:= -- 2359
add.period$ -- 100
call.type$ -- 33
change.case$ -- 245
chr.to.int$ -- 33
cite$ -- 37
duplicate$ -- 562
empty$ -- 982
format.name$ -- 336
if$ -- 2922
int.to.chr$ -- 1
int.to.str$ -- 0
missing$ -- 38
newline$ -- 165
num.names$ -- 84
pop$ -- 300
preamble$ -- 1
purify$ -- 294
quote$ -- 0
skip$ -- 442
stack$ -- 0
substring$ -- 626
swap$ -- 108
text.length$ -- 18
text.prefix$ -- 13
top$ -- 0
type$ -- 218
warning$ -- 3
while$ -- 111
width$ -- 38
write$ -- 409
(There were 3 warnings)
This diff is collapsed.
This diff is collapsed.
\BOOKMARK [0][-]{chapter.1}{Introduction}{}% 1