Merge branch 'master' into develop
# Conflicts:
# src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
diff --git a/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc b/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
index fb5eb6c..682a766 100644
--- a/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
+++ b/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
@@ -14,23 +14,20 @@
////
= openKonsequenz - Architecture of the module 'Grid Failure Information'
-
+Michel Alessandrini <michel.alessandrini@pta.de>; Frank Dietrich <frank.dietrich@pta.de>; Simon Reis <simon.reis@pta.de>
+:revnumber: 0.2
+:revdate: 03-07-2020
+:revremark: Inital Draft
<<<
Based on the ARC42-Template (v7.0):
-* Version: 0.2
-* Date: 03.07.2020
-* Status: Inital Draft
+* Version: {revnumber}
+* Date: {revdate}
+* Status: {revremark}
<<<
-:Author: Frank Dietrich
-:Email: frank.dietrich@pta.de
-
-:Date: 2020-07-06
-:Revision: 0.2
-
:icons:
:source-highlighter: highlightjs
:highlightjs-theme: solarized_dark
@@ -112,9 +109,9 @@
|Role/Name|Contact|Expectations
|Product Owner (represents the Distribution System Operators)|Maike Salbeck, Carsten Otten, Benedikt Herget, Rainer Fuhrmann|The software must fulfil their functional and nonfunctional requirements.
|Module Developer|Michel Alessandrini, Jonas Tewolde, Frank Dietrich|All relevant business and technical information must be available for implementing the software.
-|External Reviewer (represents the AC/QC)|Elmar Schlenker|The software and the documentation is realized according to the Quality and Architecture Handbook of openKONSEQUENZ.
-|External Reviewer (represents the Eclipse-Requirements)|Eclipse Foundation Inc.|The software is licensed under the EPL 2.0. It must be validated that all requirements are fulfilled.
-|System Integrator|DSO specific|A documentation for the integration of the module in the DSO specific environments must be available.
+|External Reviewer (represents the AC/QC)|n.n.|The software and the documentation is realized according to the Quality and Architecture Handbook of openKONSEQUENZ.
+|External Reviewer (represents the Eclipse-Requirements)|n.n.|The software is licensed under the EPL 2.0. It must be validated that all requirements are fulfilled.
+|System Integrator|n.n.|A documentation for the integration of the module in the DSO specific environments must be available.
|=========================================================
<<<
@@ -157,7 +154,7 @@
a|* According to oK-GUI-Styleguide
|Java QA environment
-a| * Sonarqube 8.0
+a| * Sonarqube 5.6.6
|Programming language
a|* Backend: Java 1.8
@@ -198,7 +195,6 @@
==== Libraries
The following libraries are used:
-
TODO: Am Ende die Bibliotheken aktualisieren
.Libraries
@@ -503,7 +499,7 @@
* *Core Module 'Contact base data'* The user management can only by done by the module contact base data.
Therefore, it is essential to user the module ''Contact base data' for managing all users and customers.
-* *Core Module 'CIM-Cache'* The 'Grid Failure Information' can only communicate via the CIM-Cache with the SCADA system .
+* *Core Module 'CIM-Cache'* The 'Grid Failure Information' can only communicate via the CIM-Cachewith the SCADA system .
Therefore, it is essential to invoke the module 'CIM-Cache' for getting information from the SCADA system.
* *User Module 'eLogbook'* The 'Grid Failure Information' can import failure information from the module 'eLogbook'.
@@ -673,7 +669,6 @@
Controller --> Service
Service --> Repository
Repository --> Model
-
}
node DBMS {
@@ -990,6 +985,13 @@
* *rabbitmq.routingkey* Routing key for the import queue
* *rabbitmq.exchangename*: Exchange name for the import queue
+* *rabbitmq.importExchange*: Exchange name for the import queue
+* *rabbitmq.importQueue* Queuename for the import queue (will be created by the backend)
+* *rabbitmq.importkey* Routing key for the import queue
+* *rabbitmq.exportExchange*: Exchange name for the export queue
+* *rabbitmq.exportQueue*: Queuename for the export queue (will be created by the backend)
+* *rabbitmq.exportKey*: Exchange name for the export queue
+
_Credentials(Username and Password)_
All credentials in this yml-files are hidden. Environment variables are used to set
