Commit 0a9235ef authored by Bernhard Rumpe's avatar Bernhard Rumpe

BR-sy

parent 9e266e92
Pipeline #175556 failed with stage
in 13 seconds
# (c) https://github.com/MontiCore/monticore
image: maven:3-jdk-8 image: maven:3-jdk-8
......
# (c) https://github.com/MontiCore/monticore
script: script:
- git checkout ${TRAVIS_BRANCH} - 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" - 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"
......
<!-- (c) https://github.com/MontiCore/monticore -->
# Server # Server
![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/build.svg) ![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) ![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, ...@@ -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: 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 $ docker-compose up postgres -d
``` ```
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- (c) https://github.com/MontiCore/monticore -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>montisim</artifactId> <artifactId>montisim</artifactId>
......
<!-- (c) https://github.com/MontiCore/monticore -->
<zone> <zone>
<name>World</name> <name>World</name>
<isCustomLogin>false</isCustomLogin> <isCustomLogin>false</isCustomLogin>
...@@ -159,4 +160,4 @@ ...@@ -159,4 +160,4 @@
<blockTime>3000</blockTime> <blockTime>3000</blockTime>
</databaseManager> </databaseManager>
<allowUploads>true</allowUploads> <allowUploads>true</allowUploads>
</zone> </zone>
\ No newline at end of file
# (c) https://github.com/MontiCore/monticore
version: "3" version: "3"
services: services:
......
sqlite3 world.db ".read sqlite-world.sql" @rem (c) https://github.com/MontiCore/monticore
\ No newline at end of file sqlite3 world.db ".read sqlite-world.sql"
#!/bin/bash #!/bin/bash
# (c) https://github.com/MontiCore/monticore
sqlite3 world_linux.db ".read sqlite-world.sql" sqlite3 world_linux.db ".read sqlite-world.sql"
\ No newline at end of file
@rem (c) https://github.com/MontiCore/monticore
REM Batch script REM Batch script
SET CONFIG_DIR=main\resources SET CONFIG_DIR=main\resources
......
#!/bin/bash #!/bin/bash
# (c) https://github.com/MontiCore/monticore
CONFIG_DIR="main/resources" CONFIG_DIR="main/resources"
CONFIG_FILE="config.properties" CONFIG_FILE="config.properties"
...@@ -17,4 +18,4 @@ cp -nf $SQLITE_DB $SFS_EXT_DIR/world.db ...@@ -17,4 +18,4 @@ cp -nf $SQLITE_DB $SFS_EXT_DIR/world.db
#Change permissions for all extensions #Change permissions for all extensions
chmod -R +x $SFS_EXT_DIR chmod -R +x $SFS_EXT_DIR
echo Extensions deployed \(Platform Unix\) echo Extensions deployed \(Platform Unix\)
\ No newline at end of file
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) https://github.com/MontiCore/monticore
# This script re-compile all *.fmu files in the current directory using # This script re-compile all *.fmu files in the current directory using
# current available c++ compiler. This makes the fmu files compatible with # current available c++ compiler. This makes the fmu files compatible with
......
/* (c) https://github.com/MontiCore/monticore */
sim Aachen { sim Aachen {
sim_duration 4h; sim_duration 4h;
......
/* (c) https://github.com/MontiCore/monticore */
sim Aachen { sim Aachen {
sim_duration 4h; sim_duration 4h;
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!-- (c) https://github.com/MontiCore/monticore -->
******************************************************************************
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 <http://www.gnu.org/licenses/>.
*******************************************************************************
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
......
<!-- (c) https://github.com/MontiCore/monticore -->
This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also
......
...@@ -6,4 +6,4 @@ COPY . . ...@@ -6,4 +6,4 @@ COPY . .
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y openjfx && \ apt-get install -y openjfx && \
cd /app/rpc && \ cd /app/rpc && \
mvn install -DskipTests -s ../settings.xml mvn install -DskipTests -s ../settings.xml
\ No newline at end of file
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) https://github.com/MontiCore/monticore
cp ./target/classes/app.db app.db cp ./target/classes/app.db app.db
cp ./target/restful-2.0.0.jar app.jar cp ./target/restful-2.0.0.jar app.jar
......
# (c) https://github.com/MontiCore/monticore
version: "3" version: "3"
services: services:
......
# (c) https://github.com/MontiCore/monticore
swagger: "2.0" swagger: "2.0"
info: info:
description: "API doc for MontiSim server" description: "API doc for MontiSim server"
...@@ -471,4 +472,4 @@ definitions: ...@@ -471,4 +472,4 @@ definitions:
$ref: "#/definitions/DataFrame" $ref: "#/definitions/DataFrame"
externalDocs: externalDocs:
description: "MontiSim server" description: "MontiSim server"
url: "https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server" url: "https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server"
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- (c) https://github.com/MontiCore/monticore -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
...@@ -237,4 +238,4 @@ ...@@ -237,4 +238,4 @@
<url>https://nexus.se.rwth-aachen.de/content/repositories/embeddedmontiarc-snapshots/</url> <url>https://nexus.se.rwth-aachen.de/content/repositories/embeddedmontiarc-snapshots/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
</project> </project>
\ No newline at end of file
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) https://github.com/MontiCore/monticore
# this script serves the purpose of running unitetests in gitlab-runner. # this script serves the purpose of running unitetests in gitlab-runner.
# It starts all dependent services needed before starting the tests. # It starts all dependent services needed before starting the tests.
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful; package server.restful;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful; package server.restful;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.dao; package server.restful.dao;
import org.slf4j.Logger; import org.slf4j.Logger;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.dao; package server.restful.dao;
import server.restful.model.MapModel; import server.restful.model.MapModel;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.dao; package server.restful.dao;
import server.restful.model.ScenarioModel; import server.restful.model.ScenarioModel;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.dao; package server.restful.dao;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.graph; package server.restful.graph;
import commons.controller.commons.Vertex; import commons.controller.commons.Vertex;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.graph; package server.restful.graph;
import commons.controller.commons.Vertex; import commons.controller.commons.Vertex;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.graph.structures; package server.restful.graph.structures;
import structures.Edge; import structures.Edge;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.model; package server.restful.model;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.model; package server.restful.model;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.model; package server.restful.model;
import commons.controller.commons.Vertex; import commons.controller.commons.Vertex;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.model; package server.restful.model;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.model; package server.restful.model;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.model; package server.restful.model;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
/** /**
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
import org.I0Itec.zkclient.exception.ZkTimeoutException; import org.I0Itec.zkclient.exception.ZkTimeoutException;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
public class RemoteAutopilotService extends RemoteService{ public class RemoteAutopilotService extends RemoteService{
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.ZkClient;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
import java.util.List; import java.util.List;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
public interface ServiceRegistry { public interface ServiceRegistry {
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry; package server.restful.registry;
import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.ZkClient;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry.util; package server.restful.registry.util;
import org.I0Itec.zkclient.IZkDataListener; import org.I0Itec.zkclient.IZkDataListener;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.registry.util; package server.restful.registry.util;
import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.ZkClient;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import commons.controller.commons.Vertex; import commons.controller.commons.Vertex;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import commons.controller.commons.Vertex; import commons.controller.commons.Vertex;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import server.restful.dao.ScenarioDAO; import server.restful.dao.ScenarioDAO;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import de.monticore.lang.montisim.simlang.SimLangTool; import de.monticore.lang.montisim.simlang.SimLangTool;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import commons.controller.commons.Vertex; import commons.controller.commons.Vertex;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.service; package server.restful.service;
import org.slf4j.Logger; import org.slf4j.Logger;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.util; package server.restful.util;
import org.slf4j.Logger; import org.slf4j.Logger;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.view; package server.restful.view;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.view; package server.restful.view;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.view; package server.restful.view;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
......
...@@ -4,4 +4,4 @@ spring.resources.chain.cache=true ...@@ -4,4 +4,4 @@ spring.resources.chain.cache=true
# file upload size limit # file upload size limit
spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB spring.servlet.multipart.max-request-size=10MB
server.port=8090 server.port=8090
\ No newline at end of file
...@@ -14,4 +14,4 @@ simulation_step_ms=500 ...@@ -14,4 +14,4 @@ simulation_step_ms=500
windows_dev_mode=false windows_dev_mode=false
# define the maximum simulation duration # define the maximum simulation duration
max_simulation_time_ms=10000 max_simulation_time_ms=10000
\ No newline at end of file
# (c) https://github.com/MontiCore/monticore
from peewee import * from peewee import *
db = SqliteDatabase("app.db") db = SqliteDatabase("app.db")
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.api; package server.restful.api;
import org.junit.Test; import org.junit.Test;
......
/* (c) https://github.com/MontiCore/monticore */
package server.restful.dao; package server.restful.dao;
import org.junit.Before;