Merge branch 'ocdaTestGenerator' of github.com:rwth-acis/REST-OCD-Ser…

…vices into ocdaTestGenerator

update fork with the latest changes from the upstream repository

.gitignore

@@ -13,6 +13,7 @@ etc/ivy/ivy.jar
 /.idea
 restMapping.xml
 /out
+/ocd/arangoDB/db/*
 /ocd/doca/cover.txt
 /ocd/doca/network.txt
 /ocd/eclipselink/serviceCreateDLL.jdbc

docs/_data/toc.yml

@@ -95,17 +95,19 @@
   links:
     - title: "About"
       url: "about"
-    - title: Class Models
-      url: "pages/wiki/class-models"
+    - title: Architecture/Class Models
+      url: "pages/wiki/architecture-class-models"
       children:
+        - title: WebOCD Architecture
+          url: "pages/wiki/architecture-class-models#webocd-architecture"
         - title: Service Architecture
-          url: "pages/wiki/class-models#service-architecture"
+          url: "pages/wiki/architecture-class-models#service-architecture"
         - title: Algorithms
-          url: "pages/wiki/class-models#algorithms"
+          url: "pages/wiki/architecture-class-models#algorithms"
         - title: Centralities
-          url: "pages/wiki/class-models#centrality"  
+          url: "pages/wiki/architecture-class-models#centrality"  
         - title: Cooperation Simulations
-          url: "pages/wiki/class-models#simulation"
+          url: "pages/wiki/architecture-class-models#simulation"
 - title: Tutorials
   url: tutorials
   links:

docs/pages/wiki/class-models.md → docs/pages/wiki/architecture-class-models.md

@@ -1,15 +1,17 @@
 ---
 layout: page
-title: Class Models
+title: Architecture and Class Models
 ---
 
 # Introduction
-On this page you will get an overview of the service itself and the class structure of the services most important packages.
-# Service Architecture
+On this page you will get an overview of WebOCD and the class structure of the ocd services most important packages.
+# WebOCD Architecture
+![algorithms_package](/REST-OCD-Services/assets/img/WebOCD_Architecture.png "Simplified view of WebOCD's architecture"){: width="auto"; height="auto"}
+# OCD Service Architecture
 ![algorithms_package](/REST-OCD-Services/assets/img/Service_Architecture.png "Simplified view of service architecture"){: width="auto"; height="auto"}
-# algorithms
+## algorithms
 ![algorithms_package-button](/REST-OCD-Services/assets/img/algorithms_package_plusAlgoExec.png "Simplified class diagram of ocd.algorithms"){: width="auto"; height="auto"}
-# centrality
+## centrality
 ![centralities_package-button](/REST-OCD-Services/assets/img/centralities_package_plusAlgoExec.png "Simplified class diagram of ocd.centrality"){: width="auto"; height="auto"}
-# simulation
+## simulation
 ![simulations_package-button](/REST-OCD-Services/assets/img/simulations_package_plusAlgoExec.png "Simplified class diagram of ocd.cooperation.simulation"){: width="auto"; height="auto"}

etc/i5.las2peer.connectors.webConnector.WebConnector.properties

@@ -9,4 +9,4 @@ crossOriginResourceMaxAge = 600
 maxRequestBodySize = 300000000
 enableCrossOriginResourceSharing = TRUE
 onlyLocalServices = TRUE
-oidcProviders = https://auth.las2peer.org/o/oauth2,https://accounts.google.com
+oidcProviders = https://auth.las2peer.org/auth/realms/main,https://accounts.google.com

gradle.properties

@@ -1,4 +1,4 @@
-core.version=1.2.2
+core.version=1.2.3
 service.name=i5.las2peer.services.ocd
 service.class=ServiceClass
 service.version=1.0.0