Merge branch 'Development'

# Conflicts:
#	dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts

.env

@@ -0,0 +1,5 @@
+PROFILE=docker
+
+# Version of Elastic products
+ELK_VERSION=7.17.4
+STACK_VERSION=7.17.4

.gitignore

@@ -1,32 +1,32 @@
 dmp-frontend/dist.7z
 .idea/
 *.iml
-backend/src/main/ui-resources/static/vendor.bundle.js.map
-backend/src/main/ui-resources/static/vendor.bundle.js
-backend/src/main/ui-resources/static/unauthorized.module.chunk.js.map
-backend/src/main/ui-resources/static/unauthorized.module.chunk.js
-backend/src/main/ui-resources/static/styles.bundle.js.map
-backend/src/main/ui-resources/static/styles.bundle.js
-backend/src/main/ui-resources/static/polyfills.bundle.js.map
-backend/src/main/ui-resources/static/polyfills.bundle.js
-backend/src/main/ui-resources/static/main.bundle.js.map
-backend/src/main/ui-resources/static/main.bundle.js
-backend/src/main/ui-resources/static/lang/en.json
-backend/src/main/ui-resources/static/inline.bundle.js.map
-backend/src/main/ui-resources/static/inline.bundle.js
-backend/src/main/ui-resources/static/index.html
-backend/src/main/ui-resources/static/favicon.ico
-backend/src/main/ui-resources/static/assets/lang/en.json
+dmp-backend/src/main/ui-resources/static/vendor.bundle.js.map
+dmp-backend/src/main/ui-resources/static/vendor.bundle.js
+dmp-backend/src/main/ui-resources/static/unauthorized.module.chunk.js.map
+dmp-backend/src/main/ui-resources/static/unauthorized.module.chunk.js
+dmp-backend/src/main/ui-resources/static/styles.bundle.js.map
+dmp-backend/src/main/ui-resources/static/styles.bundle.js
+dmp-backend/src/main/ui-resources/static/polyfills.bundle.js.map
+dmp-backend/src/main/ui-resources/static/polyfills.bundle.js
+dmp-backend/src/main/ui-resources/static/main.bundle.js.map
+dmp-backend/src/main/ui-resources/static/main.bundle.js
+dmp-backend/src/main/ui-resources/static/lang/en.json
+dmp-backend/src/main/ui-resources/static/inline.bundle.js.map
+dmp-backend/src/main/ui-resources/static/inline.bundle.js
+dmp-backend/src/main/ui-resources/static/index.html
+dmp-backend/src/main/ui-resources/static/favicon.ico
+dmp-backend/src/main/ui-resources/static/assets/lang/en.json
 dmp-frontend/new  3.xml
-backend/src/main/ui-resources/static/
-backend/web/target/
+dmp-backend/src/main/ui-resources/static/
+dmp-backend/web/target/
 *.class
-backend/web/src/main/ui-resources/static/
-backend/data/target/data-1.0-SNAPSHOT.jar
-backend/data/target/
-backend/queryable/target/
-backend/elastic/target/
-backend/queryengine/target/
+dmp-backend/web/src/main/ui-resources/static/
+dmp-backend/data/target/data-1.0-SNAPSHOT.jar
+dmp-backend/data/target/
+dmp-backend/queryable/target/
+dmp-backend/elastic/target/
+dmp-backend/queryengine/target/
 *.tar
 *.gz
 final/
@@ -38,7 +38,7 @@ dmp-frontend/.vscode/
 
 
 dmp-frontend/package-lock.json
-backend/logging/target/
+dmp-backend/logging/target/
 ELK.Docker/shared/data-elk/
 
 # Eclipse
@@ -46,15 +46,6 @@ ELK.Docker/shared/data-elk/
 .settings/
 bin/
 *.classpath
-.run
-openDMP/backend/uploads/
-openDMP/backend/tmp/
-logs/
-backend/web/src/main/resources/certificates/
-/storage/
-backend/target/classes/
-backend/core/target/maven-archiver/
-backend/node_modules/.yarn-integrity
-dmp-frontend/.nx/
-notification-service/notification-web/src/main/resources/config/app.env
-backend/web/src/main/resources/config/app.env
+openDMP/dmp-backend/uploads/
+openDMP/dmp-backend/tmp/
+dmp-frontend/.angular/

ELK.Docker/.env

@@ -0,0 +1,3 @@
+ELK_VERSION=7.6.0
+# Leave blank to use the "basic" image flavours, which include X-Pack.
+# see https://www.elastic.co/subscriptions

ELK.Docker/.gitattributes

@@ -0,0 +1,2 @@
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf

ELK.Docker/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Anthony Lapenna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

ELK.Docker/README.md

@@ -0,0 +1,4 @@
+Init default users and retrieve passwords
+
+1) connect to elasticsearch container with docker exec -it elastichsearch /bin/bash
+2) run ./bin/elasticsearch-setup-passwords auto >./data/passwords.txt (press y and enter when the console shows nothing)

ELK.Docker/docker-compose.override.yml

@@ -0,0 +1,87 @@
+version: '2.4'
+
+services:
+  elasticsearch:
+    user: 1002:1002 #develuser
+    restart: unless-stopped
+    mem_limit: 2048m
+    environment:
+      - cluster.name=open-dmp-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xmx1024m -Xms1024m"
+      - xpack.license.self_generated.type=basic 
+      - xpack.monitoring.collection.enabled=true
+      - xpack.security.enabled=true
+    ulimits:
+      nproc: 65535
+      memlock:
+        soft: -1
+        hard: -1
+    volumes:
+      - ./shared/config-elk/elasticsearch/config/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro
+      - ./shared/config-elk/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
+      - ./shared/data-elk/elasticsearch-01-data:/usr/share/elasticsearch/data
+      - ./shared/data-elk/elasticsearch-01-log:/usr/share/elasticsearch/logs
+    #ports:
+    #  - 51056:9200
+    #  - 51057:9300
+    ports:
+      - "9200:9200"
+    expose:
+      - "9300"
+    networks:
+      open-dmp-elk-network:
+    
+  logstash:
+    # user: 1002:1002 #develuser
+    volumes:
+      - ./shared/config-elk/logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
+      - ./shared/config-elk/logstash/config/pipelines.yml:/usr/share/logstash/config/pipelines.yml:ro
+      - ./shared/config-elk/logstash/config/log4j2.properties:/usr/share/logstash/config/log4j2.properties:ro
+      - ./shared/config-elk/logstash/pipeline:/usr/share/logstash/pipeline:ro
+      - ./shared/config-elk/logstash/logstash/templates:/usr/share/logstash/templates
+      - ./shared/data-elk/logstash-log:/usr/share/logstash/logs
+      - ./shared/data-elk/logstash-queue:/usr/share/logstash/queue
+      - ./shared/data-elk/logstash-dead_letter_queue:/usr/share/logstash/dead_letter_queue
+    expose:
+      - "31311"
+      - "31312"
+    restart: on-failure
+    mem_limit: 2048m
+    environment:
+      - LS_JAVA_OPTS=-Xmx1024m -Xms1024m
+      - xpack.license.self_generated.type=basic 
+      - xpack.security.enabled=true
+    networks:
+      open-dmp-elk-network:
+
+  kibana:
+    # user: 1002:1002 #develuser
+    mem_limit: 512m
+    environment:
+      - xpack.license.self_generated.type=basic 
+      - xpack.security.enabled=true
+      
+    volumes:
+      - ./shared/config-elk/kibana/config:/usr/share/kibana/config:ro
+      #- ./shared/config-elk/kibana/certificates:/usr/share/kibana/certificates
+    restart: unless-stopped
+    ports:
+      - "51058:5601"
+    networks:
+      - open-dmp-elk-network
+
+  filebeat:
+    restart: unless-stopped
+    mem_limit: 256m
+    #command: [ "-e=false" ] # to overwrite the -e that disables logging to file!
+    volumes:
+      - ./shared/config-elk/filebeat/config/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
+      - ~/openDMP/logs:/usr/share/filebeat/log_data/dmp/
+      - ./shared/data-elk/filebeat-log:/usr/share/filebeat/logs
+      - ./shared/data-elk/filebeat-data:/usr/share/filebeat/data #For windows if we mount the data  directory we get "Writing of registry returned error: sync /usr/share/filebeat/data/registry/filebeat: invalid argument."
+    networks:
+      - open-dmp-elk-network
+
+networks:
+  open-dmp-elk-network:

ELK.Docker/docker-compose.yml

@@ -0,0 +1,43 @@
+version: '2.4'
+
+services:
+  elasticsearch:
+    image: ${DOCKER_REGISTRY}elasticsearch
+    container_name: elasticsearch
+    build:
+      context: elasticsearch/
+      args:
+        ELK_VERSION: $ELK_VERSION
+    healthcheck:
+      # test: curl --cacert /usr/share/elasticsearch/config/certificates/ca/ca.crt -s https://localhost:9200 >/dev/null; if [[ $$? == 52 ]]; then echo 0; else echo 1; fi
+      interval: 30s
+      timeout: 10s
+      retries: 5
+  
+  logstash:
+    image: ${DOCKER_REGISTRY}logstash
+    container_name: logstash
+    build:
+      context: logstash/
+      args:
+        ELK_VERSION: $ELK_VERSION
+    depends_on:
+      - elasticsearch
+
+  kibana:
+    image: ${DOCKER_REGISTRY}kibana
+    build:
+      context: kibana/
+      args:
+        ELK_VERSION: $ELK_VERSION
+    depends_on:
+      - elasticsearch
+  filebeat:
+    image: ${DOCKER_REGISTRY}filebeat
+    build:
+      context: filebeat/
+      args:
+        ELK_VERSION: $ELK_VERSION
+    depends_on:
+      - logstash
+

ELK.Docker/elasticsearch/Dockerfile

@@ -0,0 +1,22 @@
+ARG ELK_VERSION
+
+# https://github.com/elastic/elasticsearch-docker
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
+
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-icu && \ 
+    /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-phonetic
+
+RUN groupmod -g 1002 elasticsearch
+RUN usermod -u 1002 -g 1002 elasticsearch
+RUN chown -R elasticsearch /usr/share/elasticsearch
+RUN sed -i -e 's/--userspec=1000/--userspec=1002/g' \
+           -e 's/UID 1000/UID 1002/' \
+           -e 's/chown -R 1000/chown -R 1002/' /usr/local/bin/docker-entrypoint.sh
+RUN chown elasticsearch /usr/local/bin/docker-entrypoint.sh
+
+ENV JAVA_HOME /usr/share/elasticsearch/jdk
+
+# RUN mkdir /usr/share/elasticsearch/custom-plugins
+# COPY plugins/elasticsearch-analysis-greeklish-7.5.1.zip /usr/share/elasticsearch/custom-plugins/elasticsearch-analysis-greeklish-7.5.1.zip
+
+# RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install  file:///usr/share/elasticsearch/custom-plugins/elasticsearch-analysis-greeklish-7.5.1.zip

ELK.Docker/filebeat/Dockerfile

@@ -0,0 +1,15 @@
+ARG ELK_VERSION
+
+FROM docker.elastic.co/beats/filebeat:${ELK_VERSION}
+
+# USER root
+# RUN groupmod -g 1002 filebeat
+# RUN usermod -u 1002 -g 1002 filebeat
+# RUN chown -R filebeat /usr/share/filebeat
+# RUN sed -i -e 's/--userspec=1000/--userspec=1002/g' \
+#            -e 's/UID 1000/UID 1002/' \
+#            -e 's/chown -R 1000/chown -R 1002/' /usr/local/bin/docker-entrypoint
+# RUN chown filebeat /usr/local/bin/docker-entrypoint
+
+# USER 1002:1002
+

ELK.Docker/kibana/Dockerfile

@@ -0,0 +1,15 @@
+ARG ELK_VERSION
+
+# https://github.com/elastic/kibana-docker
+FROM docker.elastic.co/kibana/kibana:${ELK_VERSION}
+
+# USER root
+# RUN groupmod -g 1002 kibana
+# RUN usermod -g 1002 root
+# RUN usermod -u 1002 -g 1002 kibana
+# RUN chown -R kibana /usr/share/kibana
+
+# USER 1002:1002
+
+# Add your kibana plugins setup here
+# Example: RUN kibana-plugin install <name|url>

ELK.Docker/logstash/Dockerfile

@@ -0,0 +1,20 @@
+ARG ELK_VERSION
+
+# https://github.com/elastic/logstash-docker
+FROM docker.elastic.co/logstash/logstash:${ELK_VERSION}
+
+# USER root
+# RUN groupmod -g 1002 logstash
+# RUN usermod -u 1002 -g 1002 logstash
+# RUN chown -R logstash /usr/share/logstash
+# RUN sed -i -e 's/--userspec=1000/--userspec=1002/g' \
+#            -e 's/UID 1000/UID 1002/' \
+#            -e 's/chown -R 1000/chown -R 1002/' /usr/local/bin/docker-entrypoint
+# RUN chown logstash /usr/local/bin/docker-entrypoint
+
+# USER 1002:1002
+
+# Add your logstash plugins setup here
+# Example: RUN logstash-plugin install logstash-filter-json
+RUN logstash-plugin update logstash-input-beats
+RUN logstash-plugin update logstash-filter-grok

ELK.Docker/old/.env

@@ -0,0 +1,3 @@
+TAG=6.3.1
+ELASTIC_VERSION=6.3.1
+ELASTIC_PASSWORD=changeme

ELK.Docker/old/.gitignore

@@ -0,0 +1 @@
+**/*~

ELK.Docker/old/.travis.yml

@@ -0,0 +1,7 @@
+---
+language: python
+python: ['3.5']
+script: make
+
+sudo: required
+services: ['docker']

ELK.Docker/old/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

ELK.Docker/old/Makefile

@@ -0,0 +1,30 @@
+SHELL=/bin/bash
+
+ifndef ELASTIC_VERSION
+ELASTIC_VERSION := $(shell awk 'BEGIN { FS = "[= ]" } /^ELASTIC_VERSION=/ { print $$2 }' .env)
+endif
+export ELASTIC_VERSION
+
+ifndef GIT_BRANCH
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+TARGETS := apm-server elasticsearch logstash kibana beats
+
+images: $(TARGETS)
+push: $(TARGETS:%=%-push)
+clean: $(TARGETS:%=%-clean)
+
+$(TARGETS): $(TARGETS:%=%-checkout)
+	(cd stack/$@ && make)
+
+$(TARGETS:%=%-push): $(TARGETS:%=%-checkout)
+	(cd stack/$(@:%-push=%) && make push)
+
+$(TARGETS:%=%-checkout):
+	test -d stack/$(@:%-checkout=%) || \
+          git clone https://github.com/elastic/$(@:%-checkout=%)-docker.git stack/$(@:%-checkout=%)
+	(cd stack/$(@:%-checkout=%) && git fetch && git reset --hard && git checkout origin/$(GIT_BRANCH))
+
+$(TARGETS:%=%-clean):
+	rm -rf stack/$(@:%-clean=%)

ELK.Docker/old/README.md

@@ -0,0 +1,25 @@
+# stack-docker
+This example Docker Compose configuration demonstrates many components of the
+Elastic Stack, all running on a single machine under Docker.
+
+## Prerequisites
+- Docker and Compose. Windows and Mac users get Compose installed automatically
+with Docker. Linux users can:
+```
+pip install docker-compose
+```
+
+- At least 4GiB of RAM for the containers. Windows and Mac users _must_
+configure their Docker virtual machine to have more than the default 2 GiB of
+RAM:
+
+![Docker VM memory settings](screenshots/docker-vm-memory-settings.png)
+
+## Starting the stack
+Try `docker-compose up` to create a demonstration Elastic Stack with
+Elasticsearch, Kibana, Logstash, Auditbeat, Metricbeat, Filebeat, Packetbeat,
+and Heartbeat.
+
+Point a browser at [`http://localhost:5601`](http://localhost:5601) to see the results.
+
+Log in with `elastic` / `changeme`.

ELK.Docker/old/config/logstash.conf

@@ -0,0 +1,28 @@
+input {
+  http {
+    port => 31311 # default: 8080
+  }
+}
+
+filter {
+    grok{
+		match => { "message" => "%{GREEDYDATA:request}"}  
+	}
+	json{
+        source => "request"
+        target => "parsed"
+    }
+	split{
+		field=>"entries"
+	}
+
+}
+
+output {
+  elasticsearch {
+    hosts    => [ 'elasticsearch' ]
+    user     => 'elastic'
+    password => 'changeme'
+	index => "data-management-plan-%{[entries][indexType]}-%{+YYYY.MM.dd}"
+  }
+}

ELK.Docker/old/docker-compose.yml

@@ -0,0 +1,171 @@
+---
+version: '3'
+services:
+  # The environment variable "TAG" is used throughout this file to
+  # specify the version of the images to run. The default is set in the
+  # '.env' file in this folder. It can be overridden with any normal
+  # technique for setting environment variables, for example:
+  #
+  #   TAG=6.0.0-beta1 docker-compose up
+  #
+  # REF: https://docs.docker.com/compose/compose-file/#variable-substitution
+  #
+  # Also be sure to set the ELASTIC_VERSION variable. For released versions,
+  # ${TAG} and ${ELASTIC_VERSION} will be identical, but for pre-release
+  # versions, ${TAG} might contain an extra build identifier, like
+  # "6.0.0-beta1-3eab5b40", so a full invocation might look like:
+  #
+  #   ELASTIC_VERSION=6.0.0-beta1 TAG=6.0.0-beta1-3eab5b40 docker-compose up
+  #
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:${TAG}
+    container_name: elasticsearch
+    #volumes:
+     # - esdata:/usr/share/elasticsearch/data
+    environment: ['http.host=0.0.0.0', 'transport.host=127.0.0.1', 'ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
+    ports: ['0.0.0.0:9200:9200']
+    networks: ['stack']
+
+  kibana:
+    image: docker.elastic.co/kibana/kibana:${TAG}
+    container_name: kibana
+    ports: ['0.0.0.0:5601:5601']
+    networks: ['stack']
+    depends_on: ['elasticsearch']
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:${TAG}
+    container_name: logstash
+    # Provide a simple pipeline configuration for Logstash with a bind-mounted file.
+    volumes:
+      - ./config/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+    ports: ['0.0.0.0:31311:31311']
+
+    networks: ['stack']
+    depends_on: ['elasticsearch', 'setup_logstash']
+
+  filebeat:
+    image: docker.elastic.co/beats/filebeat:${TAG}
+    container_name: filebeat
+    command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
+    # If the host system has logs at "/var/log", mount them at "/mnt/log"
+    # inside the container, where Filebeat can find them.
+    # volumes: ['/var/log:/mnt/log:ro']
+    networks: ['stack']
+    depends_on: ['elasticsearch', 'setup_filebeat']
+
+  heartbeat:
+    image: docker.elastic.co/beats/heartbeat:${TAG}
+    container_name: heartbeat
+    command: -e -E 'output.elasticsearch.password=${ELASTIC_PASSWORD}'
+    networks: ['stack']
+    depends_on: ['elasticsearch', 'setup_heartbeat']
+
+  # Run a short-lived container to set up Logstash.
+  setup_logstash:
+    image: centos:7
+    container_name: setup_logstash
+    volumes: ['./scripts/setup-logstash.sh:/usr/local/bin/setup-logstash.sh:ro']
+    # The script may have CR/LF line endings if using Docker for Windows, so
+    # make sure that they don't confuse Bash.
+    command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-logstash.sh | tr -d "\r" | bash']
+    environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
+    networks: ['stack']
+    depends_on: ['elasticsearch']
+
+  setup_kibana:
+    image: centos:7
+    container_name: setup_kibana
+    volumes: ['./scripts/setup-kibana.sh:/usr/local/bin/setup-kibana.sh:ro']
+    command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-kibana.sh | tr -d "\r" | bash']
+    environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
+    networks: ['stack']
+    depends_on: ['elasticsearch']
+
+  setup_filebeat:
+    image: docker.elastic.co/beats/filebeat:${TAG}
+    container_name: setup_filebeat
+    volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
+    command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s filebeat']
+    environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
+    networks: ['stack']
+    depends_on: ['kibana']
+
+  setup_heartbeat:
+    image: docker.elastic.co/beats/heartbeat:${TAG}
+    container_name: setup_heartbeat
+    volumes: ['./scripts/setup-beat.sh:/usr/local/bin/setup-beat.sh:ro']
+    command: ['/bin/bash', '-c', 'cat /usr/local/bin/setup-beat.sh | tr -d "\r" | bash -s heartbeat']
+    environment: ['ELASTIC_PASSWORD=${ELASTIC_PASSWORD}']
+    networks: ['stack']
+    depends_on: ['kibana']
+
+
+##########################DOCSBOX######################################################################
+ # web:
+ #   restart: always
+ #   build: ./docsbox-master/docsbox
+ #   expose:
+ #     - "8000"
+ #   links:
+ #     - redis:redis
+ #   volumes:
+ #     - docsbox:/home/docsbox
+ #     - media:/home/docsbox/media
+ #   command: gunicorn -b :8000 docsbox:app
+ #   networks: ['stack']
+ #
+ # rqworker:
+ #   restart: always
+ #   build: ./docsbox-master/docsbox
+ #   links:
+ #     - redis:redis
+ #   volumes:
+ #     - web
+ #   command: rq worker -c docsbox.settings
+ #   networks: ['stack']
+ #
+ # rqscheduler:
+ #   restart: always
+ #   build: ./docsbox-master/docsbox
+ #   links:
+ #     - redis:redis
+ #   volumes:
+ #     - web
+ #   command: rqscheduler -H redis -p 6379 -d 0
+ #   networks: ['stack']
+ #
+ # nginx:
+ #   restart: always
+ #   build: ./docsbox-master/nginx/
+ #   ports:
+ #     - "81:80"
+ #   volumes:
+ #     - web
+ #   links:
+ #     - web:web
+ #   networks: ['stack']
+ #
+ # redis:
+ #   restart: always
+ #   image: redis:latest
+ #   expose:
+ #     - "6379"
+ #   volumes:
+ #     - redisdata:/data
+ #   networks: ['stack']
+
+
+##########################SETTIGNS######################################################################
+
+volumes:
+  #esdata:
+    #driver: local
+  redisdata:
+    driver: local
+  docsbox:
+    driver: local
+  media:
+    driver: local
+networks: {stack: {}}
+

ELK.Docker/old/scripts/setup-beat.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -euo pipefail
+
+beat=$1
+
+until curl -s http://kibana:5601; do
+    sleep 2
+done
+sleep 5
+
+# Load the sample dashboards for the Beat.
+# REF: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-sample-dashboards.html
+${beat} setup \
+        -E setup.kibana.host=kibana \
+        -E setup.kibana.username=elastic \
+        -E setup.kibana.password=${ELASTIC_PASSWORD} \
+        -E output.elasticsearch.password=${ELASTIC_PASSWORD}

ELK.Docker/old/scripts/setup-kibana.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+es_url=http://elastic:${ELASTIC_PASSWORD}@elasticsearch:9200
+
+# Wait for Elasticsearch to start up before doing anything.
+until curl -s $es_url -o /dev/null; do
+    sleep 1
+done

ELK.Docker/old/scripts/setup-logstash.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+es_url=http://elastic:${ELASTIC_PASSWORD}@elasticsearch:9200
+
+# Wait for Elasticsearch to start up before doing anything.
+until curl -s $es_url -o /dev/null; do
+    sleep 1
+done

ELK.Docker/old/stack/.gitignore

@@ -0,0 +1,2 @@
+*
+!/.gitignore

ELK.Docker/shared/config-elk/elasticsearch/config/elasticsearch.yml

@@ -0,0 +1,20 @@
+---
+## Default Elasticsearch configuration from elasticsearch-docker.
+## from https://github.com/elastic/elasticsearch-docker/blob/master/build/elasticsearch/elasticsearch.yml
+#
+network.host: 0.0.0.0
+
+# minimum_master_nodes need to be explicitly set when bound on a public IP
+# set to 1 to allow single node clusters
+# Details: https://github.com/elastic/elasticsearch/pull/17288
+# discovery.zen.minimum_master_nodes: 1
+
+## Use single node discovery in order to disable production mode and avoid bootstrap checks
+## see https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
+#
+discovery.type: single-node
+## Search Guard
+#
+cluster.routing.allocation.disk.watermark.flood_stage: 99%
+
+

ELK.Docker/shared/config-elk/elasticsearch/config/log4j2.properties

@@ -0,0 +1,179 @@
+#https://github.com/elastic/elasticsearch/blob/7.4/distribution/src/config/log4j2.properties
+
+status = error
+
+# log action execution errors for easier debugging
+logger.action.name = org.elasticsearch.action
+logger.action.level = debug
+
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+######## Server JSON ############################
+appender.rolling.type = RollingFile
+appender.rolling.name = rolling
+appender.rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_server.json
+appender.rolling.layout.type = ESJsonLayout
+appender.rolling.layout.type_name = server
+
+appender.rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}-%d{yyyy-MM-dd}-%i.json.gz
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 128MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.fileIndex = nomax
+appender.rolling.strategy.action.type = Delete
+appender.rolling.strategy.action.basepath = ${sys:es.logs.base_path}
+appender.rolling.strategy.action.condition.type = IfFileName
+appender.rolling.strategy.action.condition.glob = ${sys:es.logs.cluster_name}-*
+appender.rolling.strategy.action.condition.nested_condition.type = IfAccumulatedFileSize
+appender.rolling.strategy.action.condition.nested_condition.exceeds = 2GB
+################################################
+######## Server -  old style pattern ###########
+appender.rolling_old.type = RollingFile
+appender.rolling_old.name = rolling_old
+appender.rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}.log
+appender.rolling_old.layout.type = PatternLayout
+appender.rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling_old.policies.type = Policies
+appender.rolling_old.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling_old.policies.time.interval = 1
+appender.rolling_old.policies.time.modulate = true
+appender.rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling_old.policies.size.size = 128MB
+appender.rolling_old.strategy.type = DefaultRolloverStrategy
+appender.rolling_old.strategy.fileIndex = nomax
+appender.rolling_old.strategy.action.type = Delete
+appender.rolling_old.strategy.action.basepath = ${sys:es.logs.base_path}
+appender.rolling_old.strategy.action.condition.type = IfFileName
+appender.rolling_old.strategy.action.condition.glob = ${sys:es.logs.cluster_name}-*
+appender.rolling_old.strategy.action.condition.nested_condition.type = IfAccumulatedFileSize
+appender.rolling_old.strategy.action.condition.nested_condition.exceeds = 2GB
+################################################
+
+rootLogger.level = info
+rootLogger.appenderRef.console.ref = console
+rootLogger.appenderRef.rolling.ref = rolling
+rootLogger.appenderRef.rolling_old.ref = rolling_old
+
+######## Deprecation JSON #######################
+appender.deprecation_rolling.type = RollingFile
+appender.deprecation_rolling.name = deprecation_rolling
+appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.json
+appender.deprecation_rolling.layout.type = ESJsonLayout
+appender.deprecation_rolling.layout.type_name = deprecation
+appender.deprecation_rolling.layout.esmessagefields=x-opaque-id
+
+appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.json.gz
+appender.deprecation_rolling.policies.type = Policies
+appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.size.size = 1GB
+appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling.strategy.max = 4
+#################################################
+######## Deprecation -  old style pattern #######
+appender.deprecation_rolling_old.type = RollingFile
+appender.deprecation_rolling_old.name = deprecation_rolling_old
+appender.deprecation_rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.log
+appender.deprecation_rolling_old.layout.type = PatternLayout
+appender.deprecation_rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.deprecation_rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _deprecation-%i.log.gz
+appender.deprecation_rolling_old.policies.type = Policies
+appender.deprecation_rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling_old.policies.size.size = 1GB
+appender.deprecation_rolling_old.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling_old.strategy.max = 4
+#################################################
+logger.deprecation.name = org.elasticsearch.deprecation
+logger.deprecation.level = warn
+logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
+logger.deprecation.appenderRef.deprecation_rolling_old.ref = deprecation_rolling_old
+logger.deprecation.additivity = false
+
+######## Search slowlog JSON ####################
+appender.index_search_slowlog_rolling.type = RollingFile
+appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
+appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs\
+  .cluster_name}_index_search_slowlog.json
+appender.index_search_slowlog_rolling.layout.type = ESJsonLayout
+appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog
+appender.index_search_slowlog_rolling.layout.esmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id
+
+appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs\
+  .cluster_name}_index_search_slowlog-%i.json.gz
+appender.index_search_slowlog_rolling.policies.type = Policies
+appender.index_search_slowlog_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_search_slowlog_rolling.policies.size.size = 1GB
+appender.index_search_slowlog_rolling.strategy.type = DefaultRolloverStrategy
+appender.index_search_slowlog_rolling.strategy.max = 4
+#################################################
+######## Search slowlog -  old style pattern ####
+appender.index_search_slowlog_rolling_old.type = RollingFile
+appender.index_search_slowlog_rolling_old.name = index_search_slowlog_rolling_old
+appender.index_search_slowlog_rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_search_slowlog.log
+appender.index_search_slowlog_rolling_old.layout.type = PatternLayout
+appender.index_search_slowlog_rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.index_search_slowlog_rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_search_slowlog-%i.log.gz
+appender.index_search_slowlog_rolling_old.policies.type = Policies
+appender.index_search_slowlog_rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_search_slowlog_rolling_old.policies.size.size = 1GB
+appender.index_search_slowlog_rolling_old.strategy.type = DefaultRolloverStrategy
+appender.index_search_slowlog_rolling_old.strategy.max = 4
+#################################################
+logger.index_search_slowlog_rolling.name = index.search.slowlog
+logger.index_search_slowlog_rolling.level = trace
+logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling.ref = index_search_slowlog_rolling
+logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling_old.ref = index_search_slowlog_rolling_old
+logger.index_search_slowlog_rolling.additivity = false
+
+######## Indexing slowlog JSON ##################
+appender.index_indexing_slowlog_rolling.type = RollingFile
+appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
+appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog.json
+appender.index_indexing_slowlog_rolling.layout.type = ESJsonLayout
+appender.index_indexing_slowlog_rolling.layout.type_name = index_indexing_slowlog
+appender.index_indexing_slowlog_rolling.layout.esmessagefields=message,took,took_millis,doc_type,id,routing,source
+
+appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog-%i.json.gz
+appender.index_indexing_slowlog_rolling.policies.type = Policies
+appender.index_indexing_slowlog_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_indexing_slowlog_rolling.policies.size.size = 1GB
+appender.index_indexing_slowlog_rolling.strategy.type = DefaultRolloverStrategy
+appender.index_indexing_slowlog_rolling.strategy.max = 4
+#################################################
+######## Indexing slowlog -  old style pattern ##
+appender.index_indexing_slowlog_rolling_old.type = RollingFile
+appender.index_indexing_slowlog_rolling_old.name = index_indexing_slowlog_rolling_old
+appender.index_indexing_slowlog_rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog.log
+appender.index_indexing_slowlog_rolling_old.layout.type = PatternLayout
+appender.index_indexing_slowlog_rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.index_indexing_slowlog_rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog-%i.log.gz
+appender.index_indexing_slowlog_rolling_old.policies.type = Policies
+appender.index_indexing_slowlog_rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_indexing_slowlog_rolling_old.policies.size.size = 1GB
+appender.index_indexing_slowlog_rolling_old.strategy.type = DefaultRolloverStrategy
+appender.index_indexing_slowlog_rolling_old.strategy.max = 4
+#################################################
+
+logger.index_indexing_slowlog.name = index.indexing.slowlog.index
+logger.index_indexing_slowlog.level = trace
+logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling.ref = index_indexing_slowlog_rolling
+logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling_old.ref = index_indexing_slowlog_rolling_old
+logger.index_indexing_slowlog.additivity = false

ELK.Docker/shared/config-elk/filebeat/config/filebeat.yml

@@ -0,0 +1,16 @@
+#filebeat.registry_file: /usr/share/filebeat/registry
+filebeat.inputs:
+- type: log
+  paths:
+    - /usr/share/filebeat/log_data/dmp/openDMP*.log
+  tags: ["audit"]
+  enabled: true
+  reload.enabled: true
+  reload.period: 10s
+  multiline.pattern: '^[0-9]{4}-[0-9]{2}-[0-9]{2}'
+  multiline.negate: true
+  multiline.match: after
+
+output.logstash:
+  hosts: ["logstash:31312"]
+  bulk_max_size: 128

ELK.Docker/shared/config-elk/kibana/config/kibana.yml

@@ -0,0 +1,17 @@
+---
+## Default Kibana configuration from kibana-docker.
+## from https://github.com/elastic/kibana-docker/blob/master/build/kibana/config/kibana.yml
+#
+server.name: kibana
+server.host: "0"
+## Custom configuration
+#
+#server.basePath: "/eformslogs"
+elasticsearch.hosts: [ "http://elasticsearch:9200" ]
+#elasticsearch.ssl.certificateAuthorities: [ "/usr/share/kibana/certificate_authorities/ca.crt" ]
+
+elasticsearch.username: "kibana"
+elasticsearch.password: ""
+server.ssl.enabled: false
+#server.ssl.key: "/usr/share/kibana/certificates/kibana.key"
+#server.ssl.certificate: "/usr/share/kibana/certificates/kibana.crt"

ELK.Docker/shared/config-elk/logstash/config/log4j2.properties

@@ -0,0 +1,103 @@
+#https://github.com/elastic/logstash/blob/7.4/config/log4j2.properties
+
+status = error
+name = LogstashPropertiesConfig
+
+appender.console.type = Console
+appender.console.name = plain_console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %m%n
+
+appender.json_console.type = Console
+appender.json_console.name = json_console
+appender.json_console.layout.type = JSONLayout
+appender.json_console.layout.compact = true
+appender.json_console.layout.eventEol = true
+
+appender.rolling.type = RollingFile
+appender.rolling.name = plain_rolling
+appender.rolling.fileName = ${sys:ls.logs}/logstash-${sys:ls.log.format}.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30
+
+appender.json_rolling.type = RollingFile
+appender.json_rolling.name = json_rolling
+appender.json_rolling.fileName = ${sys:ls.logs}/logstash-${sys:ls.log.format}.log
+appender.json_rolling.filePattern = ${sys:ls.logs}/logstash-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.json_rolling.policies.type = Policies
+appender.json_rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.json_rolling.policies.time.interval = 1
+appender.json_rolling.policies.time.modulate = true
+appender.json_rolling.layout.type = JSONLayout
+appender.json_rolling.layout.compact = true
+appender.json_rolling.layout.eventEol = true
+appender.json_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.json_rolling.policies.size.size = 100MB
+appender.json_rolling.strategy.type = DefaultRolloverStrategy
+appender.json_rolling.strategy.max = 30
+
+rootLogger.level = ${sys:ls.log.level}
+rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
+rootLogger.appenderRef.rolling.ref = ${sys:ls.log.format}_rolling
+
+# Slowlog
+
+appender.console_slowlog.type = Console
+appender.console_slowlog.name = plain_console_slowlog
+appender.console_slowlog.layout.type = PatternLayout
+appender.console_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+
+appender.json_console_slowlog.type = Console
+appender.json_console_slowlog.name = json_console_slowlog
+appender.json_console_slowlog.layout.type = JSONLayout
+appender.json_console_slowlog.layout.compact = true
+appender.json_console_slowlog.layout.eventEol = true
+
+appender.rolling_slowlog.type = RollingFile
+appender.rolling_slowlog.name = plain_rolling_slowlog
+appender.rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}.log
+appender.rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling_slowlog.policies.type = Policies
+appender.rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling_slowlog.policies.time.interval = 1
+appender.rolling_slowlog.policies.time.modulate = true
+appender.rolling_slowlog.layout.type = PatternLayout
+appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.rolling_slowlog.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling_slowlog.policies.size.size = 100MB
+appender.rolling_slowlog.strategy.type = DefaultRolloverStrategy
+appender.rolling_slowlog.strategy.max = 30
+
+appender.json_rolling_slowlog.type = RollingFile
+appender.json_rolling_slowlog.name = json_rolling_slowlog
+appender.json_rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}.log
+appender.json_rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.json_rolling_slowlog.policies.type = Policies
+appender.json_rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
+appender.json_rolling_slowlog.policies.time.interval = 1
+appender.json_rolling_slowlog.policies.time.modulate = true
+appender.json_rolling_slowlog.layout.type = JSONLayout
+appender.json_rolling_slowlog.layout.compact = true
+appender.json_rolling_slowlog.layout.eventEol = true
+appender.json_rolling_slowlog.policies.size.type = SizeBasedTriggeringPolicy
+appender.json_rolling_slowlog.policies.size.size = 100MB
+appender.json_rolling_slowlog.strategy.type = DefaultRolloverStrategy
+appender.json_rolling_slowlog.strategy.max = 30
+
+logger.slowlog.name = slowlog
+logger.slowlog.level = trace
+logger.slowlog.appenderRef.console_slowlog.ref = ${sys:ls.log.format}_console_slowlog
+logger.slowlog.appenderRef.rolling_slowlog.ref = ${sys:ls.log.format}_rolling_slowlog
+logger.slowlog.additivity = false
+
+logger.licensereader.name = logstash.licensechecker.licensereader
+logger.licensereader.level = error

ELK.Docker/shared/config-elk/logstash/config/logstash.yml

@@ -0,0 +1,10 @@
+---
+## Default Logstash configuration from logstash-docker.
+## from https://github.com/elastic/logstash-docker/blob/master/build/logstash/config/logstash-oss.yml
+#
+http.host: "0.0.0.0"
+config.reload.automatic: true
+config.reload.interval: 300s
+path.queue: /usr/share/logstash/queue
+path.dead_letter_queue: /usr/share/logstash/dead_letter_queue
+xpack.monitoring.elasticsearch.password:

ELK.Docker/shared/config-elk/logstash/config/pipelines.yml

@@ -0,0 +1,18 @@
+- pipeline.id: open_dmp_beats
+  queue.type: persisted
+  queue.max_bytes: 50mb
+  dead_letter_queue.enable: true
+  path.config: "/usr/share/logstash/pipeline/open_dmp_beats.conf"
+  queue.checkpoint.writes: 32
+- pipeline.id: open_dmp_main
+  queue.type: persisted
+  queue.max_bytes: 50mb
+  dead_letter_queue.enable: true
+  path.config: "/usr/share/logstash/pipeline/open_dmp_main.conf"
+  queue.checkpoint.writes: 32
+- pipeline.id: open_dmp_send_to_elastic
+  queue.type: persisted
+  queue.max_bytes: 50mb
+  dead_letter_queue.enable: true
+  path.config: "/usr/share/logstash/pipeline/open_dmp_send_to_elastic.conf"
+  queue.checkpoint.writes: 32

ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_beats.conf

@@ -0,0 +1,14 @@
+input {
+  beats {
+    port => 31312
+	ssl => false
+	client_inactivity_timeout => 3000
+  }
+}
+
+filter {
+}
+
+output {
+	pipeline { send_to => open_dmp_main }
+}

ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_main.conf

@@ -0,0 +1,19 @@
+input {
+  pipeline { address => open_dmp_main }
+}
+
+filter {
+	grok {
+		match => { "message" => "(?<timestamp>%{DATE} %{TIME})%{SPACE}%{LOGLEVEL:level} %{NUMBER:pid} --- \[%{DATA:thread}\] %{DATA:class}%{SPACE}: %{GREEDYDATA:logmessage}" }
+	}
+	if "_grokparsefailure" not in [tags] {
+		mutate
+		{
+			remove_field => [ "message" ]
+		}
+	}
+}
+
+output {
+	pipeline { send_to => open_dmp_send_to_elastic }
+}

ELK.Docker/shared/config-elk/logstash/pipeline/open_dmp_send_to_elastic.conf

@@ -0,0 +1,19 @@
+input {
+	pipeline { address => open_dmp_send_to_elastic }
+}
+
+filter {
+}
+
+output {   
+	elasticsearch {
+		hosts => "elasticsearch:9200"
+		user => elastic
+		password =>
+		index =>"opendmp.logs"
+		#manage_template => true
+		#template => "/usr/share/logstash/templates/audit/openDMP.json"
+		#template_name => "cite.elas.openDMP-audit*" 
+		#template_overwrite => true
+	}
+}

Jenkinsfile

@@ -0,0 +1,66 @@
+def pipelineContext = [:]
+
+pipeline {
+	agent any
+ 
+    options {
+        skipDefaultCheckout(true)
+    }
+
+    stages {
+		stage('Checkout') {
+			steps {
+				checkout scm
+			}
+		}
+        stage('Build API') {
+            steps {
+				script {
+					pipelineContext.apiImage = docker.build("open-dmp-api:${env.BUILD_ID}", "-f dmp-backend/Dockerfile.CI dmp-backend/")
+				}
+            }
+        }
+		stage('Build WebApp') {
+            steps {
+				script {
+					pipelineContext.webappImage = docker.build("open-dmp-webapp:${env.BUILD_ID}", "-f dmp-frontend/Dockerfile.CI dmp-frontend/")
+				}
+            }
+        }
+		//stage('SonarQube analysis') {
+		//	steps {
+		//		 script {
+		//			def scannerHome = tool 'SonarQube Scanner 4.3';
+		//			withSonarQubeEnv('SonarQube') { // If you have configured more than one global server connection, you can specify its name
+		//				sh "${scannerHome}/bin/sonar-scanner"
+		//			}
+		//		}
+		//	}
+		//}
+		//// waiting for sonar results based into the configured web hook in Sonar server which push the status back to jenkins
+        //stage('SonarQube scan result check') {
+        //    steps {
+        //        timeout(time: 2, unit: 'MINUTES') {
+        //            retry(3) {
+        //                script {
+        //                    def qg = waitForQualityGate()
+        //                    if (qg.status != 'OK') {
+        //                        error "Pipeline aborted due to quality gate failure: ${qg.status}"
+        //                    }
+        //                }
+        //            }
+        //        }
+        //    }
+        //}
+		stage('Pushing to Docker Registry') {
+            steps {
+				script {
+					docker.withRegistry('http://drepo.local.cite.gr', 'b2c651c1-9a3b-4a98-a6da-e1dd7a20f512') {
+						pipelineContext.apiImage.push()
+						pipelineContext.webappImage.push()
+					}
+				}
+            }
+        }
+    }
+}

README.md

@@ -1,3 +1,9 @@
+
+**Important note: The deployment, troubleshooting, maintenance and operation of on-premises / self-served OpenDMP instances for development, testing or production use, shall be the sole responsibility of the adopter. No support is guaranteed by OpenDMP implentation team for issues that may be encountered during deployment, extension or operation of such installations.**
+
+**Documentation is provided on a best-effort basis for the code and processes around the development, deployment and operation of OpenDMP. If you find any misalignment of the actual processes with the related documentation, please let us know so that the misalignment is addressed for the benefit of future adopters.**
+
+
 # Using Docker Compose with Argos
 
 ARGOS is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.

backend/Dockerfile

@@ -1,39 +0,0 @@
-####################################### Build stage #######################################
-FROM maven:3.9-eclipse-temurin-21-alpine AS build-stage
-
-ARG MAVEN_ACCOUNT_USR
-ARG MAVEN_ACCOUNT_PSW
-ARG REVISION
-ARG PROFILE
-ENV server_username=$MAVEN_ACCOUNT_USR
-ENV server_password=$MAVEN_ACCOUNT_PSW
-ARG CITE_MAVEN_REPO_URL
-
-COPY pom.xml /build/
-COPY core /build/core/
-COPY web /build/web/
-COPY settings.xml /root/.m2/settings.xml
-RUN rm -f /build/web/src/main/resources/config/*-devel.yml
-RUN rm -f /build/web/src/main/resources/logging/*.xml
-
-WORKDIR /build/
-
-#RUN mvn package -q
-RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean
-RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install
-# Build project
-RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package
-
-######################################## Run Stage ########################################
-FROM eclipse-temurin:21-jre-alpine
-
-WORKDIR /app
-
-ARG PROFILE
-ARG REVISION
-ENV SERVER_PORT=8080
-EXPOSE ${SERVER_PORT}
-
-COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app/app.jar
-
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=file:/config/", "-jar", "/app/app.jar"]

backend/Dockerfile.Sonar

@@ -1,29 +0,0 @@
-####################################### Build stage #######################################
-FROM maven:3.9-eclipse-temurin-21-alpine
-
-ARG MAVEN_ACCOUNT_USR
-ARG MAVEN_ACCOUNT_PSW
-ARG REVISION
-ARG PROFILE
-ARG ORACLE_URL
-ARG ORACLE_TOKEN
-ENV server_username=$MAVEN_ACCOUNT_USR
-ENV server_password=$MAVEN_ACCOUNT_PSW
-ARG CITE_MAVEN_REPO_URL
-
-COPY pom.xml /build/
-COPY core /build/core/
-COPY web /build/web/
-COPY settings.xml /root/.m2/settings.xml
-RUN rm -f /build/web/src/main/resources/config/*-devel.yml
-RUN rm -f /build/web/src/main/resources/logging/*.xml
-
-
-COPY oracle.local.cite.gr.crt $JAVA_HOME/conf/security
-RUN cd "$JAVA_HOME"/conf/security && keytool -cacerts -storepass changeit -noprompt -trustcacerts -importcert -alias oraclecert -file oracle.local.cite.gr.crt
-
-WORKDIR /build/
-RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean
-RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install
-RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package
-RUN mvn sonar:sonar -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} -Dsonar.projectKey=OpenDMP:backend-api -Dsonar.login=${ORACLE_TOKEN} -Dsonar.host.url=${ORACLE_URL} -Dsonar.projectName='OpenDMP API'

backend/core/pom.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>core</artifactId>
-    <version>${revision}</version>
-    
-    <parent>
-        <groupId>org.opencdmp</groupId>
-        <artifactId>opencdmp-backend</artifactId>
-        <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <java.version>21</java.version>
-		<maven.compiler.release>21</maven.compiler.release>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>1.0.0-SNAPSHOT</revision>
-    </properties>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-csv</artifactId>
-            <version>1.10.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>validation</artifactId>
-            <version>3.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>oidc-authz</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opencdmp</groupId>
-            <artifactId>repositorydepositbase</artifactId>
-            <version>2.0.15</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opencdmp</groupId>
-            <artifactId>common-models</artifactId>
-            <version>0.0.18</version>
-        </dependency>
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>data-tools</artifactId>
-            <version>2.1.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opencdmp</groupId>
-            <artifactId>file-transformer-base</artifactId>
-            <version>0.0.23</version>
-        </dependency>
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>elastic</artifactId>
-            <version>2.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>queue-inbox</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>queue-outbox</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>oidc-authn</artifactId>
-            <version>2.2.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>gr.cite</groupId>
-            <artifactId>keycloak-api</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>21</source>
-                    <target>21</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

backend/core/src/main/java/org/opencdmp/audit/AuditableAction.java

@@ -1,183 +0,0 @@
-package org.opencdmp.audit;
-
-import gr.cite.tools.logging.EventId;
-
-public class AuditableAction {
-
-    public static final EventId DescriptionTemplateType_Query = new EventId(1000, "DescriptionTemplateType_Query");
-    public static final EventId DescriptionTemplateType_Lookup = new EventId(1001, "DescriptionTemplateType_Lookup");
-    public static final EventId DescriptionTemplateType_Persist = new EventId(1002, "DescriptionTemplateType_Persist");
-    public static final EventId DescriptionTemplateType_Delete = new EventId(1003, "DescriptionTemplateType_Delete");
-
-    public static final EventId EntityDoi_Query = new EventId(2000, "EntityDoi_Query");
-    public static final EventId EntityDoi_Lookup = new EventId(2001, "EntityDoi_Lookup");
-    public static final EventId EntityDoi_Persist = new EventId(2002, "EntityDoi_Persist");
-    public static final EventId EntityDoi_Delete = new EventId(2003, "EntityDoi_Delete");
-
-    public static final EventId DmpBlueprint_Query = new EventId(3000, "DmpBlueprint_Query");
-    public static final EventId DmpBlueprint_Lookup = new EventId(3001, "DmpBlueprint_Lookup");
-    public static final EventId DmpBlueprint_Persist = new EventId(3002, "DmpBlueprint_Persist");
-    public static final EventId DmpBlueprint_Delete = new EventId(3003, "DmpBlueprint_Delete");
-    public static final EventId DmpBlueprint_Clone = new EventId(3004, "DmpBlueprint_Clone");
-
-    public static final EventId DmpBlueprint_PersistNewVersion = new EventId(3005, "DmpBlueprint_PersistNewVersion");
-    public static final EventId DmpBlueprint_GetXml = new EventId(3006, "DmpBlueprint_GetXml");
-    public static final EventId DmpBlueprint_Import = new EventId(3007, "DmpBlueprint_Import");
-
-    public static final EventId User_Settings_Query = new EventId(4000, "User_Settings_Query");
-    public static final EventId User_Settings_Lookup = new EventId(4001, "User_Settings_Lookup");
-    public static final EventId User_Settings_Persist = new EventId(4002, "User_Settings_Persist");
-    public static final EventId User_Settings_Delete = new EventId(4003, "User_Settings_Delete");
-
-    public static final EventId Dmp_Query = new EventId(5000, "Dmp_Query");
-    public static final EventId Dmp_Lookup = new EventId(5001, "Dmp_Lookup");
-    public static final EventId Dmp_Persist = new EventId(5002, "Dmp_Persist");
-    public static final EventId Dmp_Delete = new EventId(5003, "Dmp_Delete");
-    public static final EventId Dmp_Clone = new EventId(5004, "Dmp_Clone");
-    public static final EventId Dmp_PersistNewVersion = new EventId(5005, "Dmp_PersistNewVersion");
-    public static final EventId Dmp_Assign_Users = new EventId(5006, "Dmp_Assign_Users");
-    public static final EventId Dmp_RemoveUser = new EventId(5007, "Dmp_RemoveUser");
-    public static final EventId Dmp_Invite_Users = new EventId(5008, "Dmp_Invite_Users");
-    public static final EventId Dmp_Invite_Accept = new EventId(5009, "Dmp_Invite_Accept");
-    public static final EventId Dmp_PublicQuery = new EventId(5010, "Dmp_PublicQuery");
-    public static final EventId Dmp_Export = new EventId(5011, "Dmp_Export");
-    public static final EventId Dmp_PublicLookup = new EventId(5012, "Dmp_PublicLookup");
-    public static final EventId Dmp_Finalize = new EventId(5013, "Dmp_Finalize");
-    public static final EventId Dmp_Undo_Finalize = new EventId(5014, "Dmp_Undo_Finalize");
-    public static final EventId Dmp_Validate = new EventId(5015, "Dmp_Validate");
-    public static final EventId Dmp_GetXml = new EventId(5016, "Dmp_GetXml");
-    public static final EventId Dmp_Import = new EventId(5017, "Dmp_Import");
-
-
-    public static final EventId Description_Query = new EventId(6000, "Description_Query");
-    public static final EventId Description_Lookup = new EventId(6001, "Description_Lookup");
-    public static final EventId Description_Persist = new EventId(6002, "Description_Persist");
-    public static final EventId Description_Delete = new EventId(6003, "Description_Delete");
-    public static final EventId Description_PublicQuery = new EventId(6004, "Description_PublicQuery");
-    public static final EventId Description_PublicLookup = new EventId(6005, "Description_PublicLookup");
-    public static final EventId Description_PersistStatus = new EventId(6006, "Description_PersistStatus");
-    public static final EventId Description_UploadFieldFiles = new EventId(6007, "Description_UploadFieldFiles");
-    public static final EventId Description_GetFieldFile = new EventId(6008, "Description_GetFieldFile");
-    public static final EventId Description_Validate = new EventId(6009, "Description_Validate");
-    public static final EventId Description_GetDescriptionSectionPermissions = new EventId(6010, "Description_GetDescriptionSectionPermissions");
-    public static final EventId Description_UpdateDescriptionTemplate = new EventId(6011, "Description_UpdateDescriptionTemplate");
-
-    
-    public static final EventId Reference_Query = new EventId(7000, "Reference_Query");
-    public static final EventId Reference_Lookup = new EventId(7001, "Reference_Lookup");
-    public static final EventId Reference_Persist = new EventId(7002, "Reference_Persist");
-    public static final EventId Reference_Delete = new EventId(7003, "Reference_Delete");
-    public static final EventId Reference_Search = new EventId(7004, "Reference_Search");
-    
-    public static final EventId DescriptionTemplate_Query = new EventId(8000, "DescriptionTemplate_Query");
-    public static final EventId DescriptionTemplate_Lookup = new EventId(8001, "DescriptionTemplate_Lookup");
-    public static final EventId DescriptionTemplate_Persist = new EventId(8002, "DescriptionTemplate_Persist");
-    public static final EventId DescriptionTemplate_Delete = new EventId(8003, "DescriptionTemplate_Delete");
-    public static final EventId DescriptionTemplate_Clone = new EventId(8004, "DescriptionTemplate_Clone");
-    public static final EventId DescriptionTemplate_PersistNewVersion = new EventId(8005, "DescriptionTemplate_PersistNewVersion");
-    public static final EventId DescriptionTemplate_GetXml = new EventId(8006, "DescriptionTemplate_GetXml");
-    public static final EventId DescriptionTemplate_Import = new EventId(8007, "DescriptionTemplate_Import");
-    
-    public static final EventId SupportiveMaterial_Query = new EventId(9000, "SupportiveMaterial_Query");
-    public static final EventId SupportiveMaterial_Lookup = new EventId(9001, "SupportiveMaterial_Lookup");
-    public static final EventId SupportiveMaterial_Persist = new EventId(9002, "SupportiveMaterial_Persist");
-    public static final EventId SupportiveMaterial_Delete = new EventId(9003, "SupportiveMaterial_Delete");
-
-    public static final EventId ReferenceType_Query = new EventId(10000, "ReferenceType_Query");
-    public static final EventId ReferenceType_Lookup = new EventId(10001, "ReferenceType_Lookup");
-    public static final EventId ReferenceType_Persist = new EventId(10002, "ReferenceType_Persist");
-    public static final EventId ReferenceType_Delete = new EventId(10003, "ReferenceType_Delete");
-
-    public static final EventId User_Query = new EventId(11000, "User_Query");
-    public static final EventId User_Lookup = new EventId(11001, "User_Lookup");
-    public static final EventId User_Persist = new EventId(11002, "User_Persist");
-    public static final EventId User_Delete = new EventId(11003, "User_Delete");
-    public static final EventId User_LookupByEmail = new EventId(11004, "User_LookupByEmail");
-    public static final EventId User_ExportCsv = new EventId(11005, "User_ExportCsv");
-    public static final EventId User_PersistRoles = new EventId(11006, "User_PersistRoles");
-    public static final EventId User_LanguageMine = new EventId(11007, "User_LanguageMine");
-    public static final EventId User_TimezoneMine = new EventId(11008, "User_TimezoneMine");
-    public static final EventId User_CultureMine = new EventId(11009, "User_CultureMine");
-    public static final EventId User_MergeRequest = new EventId(11010, "User_MergeRequest");
-    public static final EventId User_MergeConfirm = new EventId(11011, "User_MergeConfirm");
-    public static final EventId User_RemoveCredentialRequest = new EventId(11012, "User_RemoveCredentialRequest");
-    public static final EventId User_RemoveCredentialConfirm = new EventId(11013, "User_RemoveCredentialConfirm");
-    public static final EventId User_DmpAssociatedQuery = new EventId(11014, "User_DmpAssociatedQuery");
-    public static final EventId User_AllowMergeAccount = new EventId(11015, "User_AllowMergeAccount");
-    public static final EventId User_InviteToTenant = new EventId(11016, "User_InviteToTenant");
-    public static final EventId User_InviteToTenantConfirm = new EventId(11017, "User_InviteToTenantConfirm");
-
-    public static final EventId Tenant_Query = new EventId(12000, "Tenant_Query");
-    public static final EventId Tenant_Lookup = new EventId(12001, "Tenant_Lookup");
-    public static final EventId Tenant_Persist = new EventId(12002, "Tenant_Persist");
-    public static final EventId Tenant_Delete = new EventId(12003, "Tenant_Delete");
-    
-    public static final EventId Language_Query = new EventId(13000, "Language_Query");
-    public static final EventId Language_Lookup = new EventId(13001, "Language_Lookup");
-    public static final EventId Language_Persist = new EventId(13002, "Language_Persist");
-    public static final EventId Language_Delete = new EventId(13003, "Language_Delete");
-
-    public static final EventId StorageFile_Download = new EventId(14000, "StorageFile_Download");
-    public static final EventId StorageFile_Upload = new EventId(14001, "StorageFile_Upload");
-    public static final EventId StorageFile_Query = new EventId(14002, "StorageFile_Query");
-
-    public static final EventId Dashboard_MyRecentActivityItems = new EventId(15000, "Dashboard_MyRecentActivityItems");
-    public static final EventId Dashboard_MyDashboardStatistics = new EventId(15001, "Dashboard_MyDashboardStatistics");
-    public static final EventId Dashboard_PublicDashboardStatistics = new EventId(15002, "Dashboard_PublicDashboardStatistics");
-
-    public static final EventId Notification_Persist = new EventId(16000, "Notification_Persist");
-
-    public static final EventId Lock_Query = new EventId(17000, "Lock_Query");
-    public static final EventId Lock_Lookup = new EventId(17001, "Lock_Lookup");
-    public static final EventId Lock_Persist = new EventId(17002, "Lock_Persist");
-    public static final EventId Lock_Delete = new EventId(17003, "Lock_Delete");
-    public static final EventId Lock_IsLocked = new EventId(17004, "Lock_IsLocked");
-    public static final EventId Lock_UnLocked = new EventId(17005, "Lock_UnLocked");
-    public static final EventId Lock_Touched = new EventId(17006, "Lock_Touched");
-    public static final EventId Lock_Locked = new EventId(17007, "Lock_Locked");
-
-    public static final EventId Deposit_GetAvailableRepositories = new EventId(18000, "Deposit_GetAvailableRepositories");
-    public static final EventId Deposit_GetAccessToken = new EventId(18001, "Deposit_GetAccessToken");
-    public static final EventId Deposit_Deposit = new EventId(18002, "Deposit_Deposit");
-    public static final EventId Deposit_GetLogo = new EventId(18003, "Deposit_GetLogo");
-    public static final EventId Deposit_GetRepository = new EventId(18004, "Deposit_GetRepository");
-
-    public static final EventId Tag_Query = new EventId(19000, "Tag_Query");
-    public static final EventId Tag_Lookup = new EventId(19001, "Tag_Lookup");
-    public static final EventId Tag_Persist = new EventId(19002, "Tag_Persist");
-    public static final EventId Tag_Delete = new EventId(19003, "Tag_Delete");
-
-    public static final EventId FileTransformer_GetAvailableConfigurations = new EventId(20000, "FileTransformer_GetAvailableConfigurations");
-
-    public static final EventId ContactSupport_Sent = new EventId(210000, "ContactSupport_Sent");
-    public static final EventId ContactSupport_PublicSent = new EventId(210001, "ContactSupport_PublicSent");
-
-    public static final EventId Maintenance_GenerateElastic = new EventId(220000, "Maintenance_GenerateElastic");
-    public static final EventId Maintenance_ClearElastic = new EventId(230000, "Maintenance_ClearElastic");
-    public static final EventId Maintenance_SendUserTouchEvents = new EventId(230001, "Maintenance_SendUserTouchEvents");
-    public static final EventId Maintenance_SendTenantTouchEvents = new EventId(230002, "Maintenance_SendTenantTouchEvents");
-    public static final EventId Maintenance_SendDmpTouchEvents = new EventId(230003, "Maintenance_SendDmpTouchEvents");
-    public static final EventId Maintenance_SendDescriptionTouchEvents = new EventId(230004, "Maintenance_SendDescriptionTouchEvents");
-
-    public static final EventId Principal_Lookup = new EventId(240000, "Principal_Lookup");
-    public static final EventId Principal_MyTenants = new EventId(240001, "Principal_MyTenants");
-
-    public static final EventId GetSemantics = new EventId(250000, "GetSemantics");
-
-    public static final EventId PrefillingSource_Query = new EventId(260000, "PrefillingSource_Query");
-    public static final EventId PrefillingSource_Lookup = new EventId(260001, "PrefillingSource_Lookup");
-    public static final EventId PrefillingSource_Persist = new EventId(260002, "PrefillingSource_Persist");
-    public static final EventId PrefillingSource_Delete = new EventId(260003, "PrefillingSource_Delete");
-    public static final EventId PrefillingSource_Generate = new EventId(260004, "PrefillingSource_Generate");
-
-    public static final EventId TenantConfiguration_Query = new EventId(270000, "TenantConfiguration_Query");
-    public static final EventId TenantConfiguration_Lookup = new EventId(270001, "TenantConfiguration_Lookup");
-    public static final EventId TenantConfiguration_Persist = new EventId(270002, "TenantConfiguration_Persist");
-    public static final EventId TenantConfiguration_Delete = new EventId(270003, "TenantConfiguration_Delete");
-    public static final EventId TenantConfiguration_LookupByType = new EventId(270004, "TenantConfiguration_LookupByType");
-
-    public static final EventId Annotation_Created_Notify = new EventId(280000, "Annotation_Created_Notify");
-    
-
-    
-}

backend/core/src/main/java/org/opencdmp/authorization/AffiliatedAuthorizationRequirement.java

@@ -1,40 +0,0 @@
-package org.opencdmp.authorization;
-
-import gr.cite.commons.web.authz.policy.AuthorizationRequirement;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-public class AffiliatedAuthorizationRequirement implements AuthorizationRequirement {
-	private final Set<String> requiredPermissions;
-	private final boolean matchAll;
-
-	public AffiliatedAuthorizationRequirement(Set<String> requiredPermissions) {
-		this(false, requiredPermissions);
-	}
-
-	public AffiliatedAuthorizationRequirement(String... requiredPermissions) {
-		this(false, requiredPermissions);
-
-	}
-
-	public AffiliatedAuthorizationRequirement(boolean matchAll, Set<String> requiredPermissions) {
-		this.matchAll = matchAll;
-		this.requiredPermissions = requiredPermissions;
-	}
-
-	public AffiliatedAuthorizationRequirement(boolean matchAll, String... requiredPermissions) {
-		this.requiredPermissions = new HashSet<>();
-		this.matchAll = matchAll;
-		this.requiredPermissions.addAll(Arrays.stream(requiredPermissions).distinct().toList());
-	}
-
-	public Set<String> getRequiredPermissions() {
-		return this.requiredPermissions;
-	}
-
-	public boolean getMatchAll() {
-		return this.matchAll;
-	}
-}

backend/core/src/main/java/org/opencdmp/authorization/AffiliatedResource.java

@@ -1,33 +0,0 @@
-package org.opencdmp.authorization;
-
-import gr.cite.commons.web.authz.policy.AuthorizationResource;
-import org.opencdmp.commons.enums.DmpUserRole;
-import org.opencdmp.commons.enums.UserDescriptionTemplateRole;
-
-import java.util.HashSet;
-
-public class AffiliatedResource extends AuthorizationResource {
-	private HashSet<DmpUserRole> dmpUserRoles;
-	private HashSet<UserDescriptionTemplateRole> userDescriptionTemplateRoles;
-
-	public AffiliatedResource() {
-		this.dmpUserRoles = new HashSet<>();
-		this.userDescriptionTemplateRoles = new HashSet<>();
-	}
-
-	public HashSet<DmpUserRole> getDmpUserRoles() {
-		return this.dmpUserRoles;
-	}
-
-	public void setDmpUserRoles(HashSet<DmpUserRole> dmpUserRoles) {
-		this.dmpUserRoles = dmpUserRoles;
-	}
-
-	public HashSet<UserDescriptionTemplateRole> getUserDescriptionTemplateRoles() {
-		return this.userDescriptionTemplateRoles;
-	}
-
-	public void setUserDescriptionTemplateRoles(HashSet<UserDescriptionTemplateRole> userDescriptionTemplateRoles) {
-		this.userDescriptionTemplateRoles = userDescriptionTemplateRoles;
-	}
-}

backend/core/src/main/java/org/opencdmp/authorization/AuthorizationConfiguration.java

@@ -1,18 +0,0 @@
-package org.opencdmp.authorization;
-
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration("AppAuthorizationConfiguration")
-@EnableConfigurationProperties(AuthorizationProperties.class)
-public class AuthorizationConfiguration {
-	private final AuthorizationProperties authorizationProperties;
-
-	public AuthorizationConfiguration(AuthorizationProperties authorizationProperties) {
-		this.authorizationProperties = authorizationProperties;
-	}
-
-	public AuthorizationProperties getAuthorizationProperties() {
-		return this.authorizationProperties;
-	}
-}

backend/core/src/main/java/org/opencdmp/authorization/AuthorizationFlags.java

@@ -1,9 +0,0 @@
-package org.opencdmp.authorization;
-
-import java.util.EnumSet;
-
-public enum AuthorizationFlags {
-	None, Permission, DmpAssociated, Public, Owner, DescriptionTemplateAssociated;
-	public static final EnumSet<AuthorizationFlags> AllExceptPublic = EnumSet.of(DmpAssociated, Permission, Owner, DescriptionTemplateAssociated);
-	public static final EnumSet<AuthorizationFlags> All = EnumSet.of(DmpAssociated, Permission, Owner, Public);
-}

backend/core/src/main/java/org/opencdmp/authorization/AuthorizationProperties.java

@@ -1,83 +0,0 @@
-package org.opencdmp.authorization;
-
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.util.List;
-
-@ConfigurationProperties(prefix = "authorization")
-public class AuthorizationProperties {
-
-	private List<String> globalAdminRoles;
-	private String adminRole;
-	private String tenantAdminRole;
-	private String globalUserRole;
-	private String tenantUserRole;
-	private Boolean autoAssignGlobalAdminToNewTenants;
-	private List<String> allowedTenantRoles;
-	private List<String> allowedGlobalRoles;
-
-	public List<String> getGlobalAdminRoles() {
-		return this.globalAdminRoles;
-	}
-
-	public void setGlobalAdminRoles(List<String> globalAdminRoles) {
-		this.globalAdminRoles = globalAdminRoles;
-	}
-
-	public String getAdminRole() {
-		return this.adminRole;
-	}
-
-	public void setAdminRole(String adminRole) {
-		this.adminRole = adminRole;
-	}
-
-	public String getTenantAdminRole() {
-		return this.tenantAdminRole;
-	}
-
-	public void setTenantAdminRole(String tenantAdminRole) {
-		this.tenantAdminRole = tenantAdminRole;
-	}
-
-	public String getGlobalUserRole() {
-		return this.globalUserRole;
-	}
-
-	public void setGlobalUserRole(String globalUserRole) {
-		this.globalUserRole = globalUserRole;
-	}
-
-	public String getTenantUserRole() {
-		return this.tenantUserRole;
-	}
-
-	public void setTenantUserRole(String tenantUserRole) {
-		this.tenantUserRole = tenantUserRole;
-	}
-
-	public Boolean getAutoAssignGlobalAdminToNewTenants() {
-		return this.autoAssignGlobalAdminToNewTenants;
-	}
-
-	public void setAutoAssignGlobalAdminToNewTenants(Boolean autoAssignGlobalAdminToNewTenants) {
-		this.autoAssignGlobalAdminToNewTenants = autoAssignGlobalAdminToNewTenants;
-	}
-
-	public List<String> getAllowedTenantRoles() {
-		return this.allowedTenantRoles;
-	}
-
-	public void setAllowedTenantRoles(List<String> allowedTenantRoles) {
-		this.allowedTenantRoles = allowedTenantRoles;
-	}
-
-	public List<String> getAllowedGlobalRoles() {
-		return this.allowedGlobalRoles;
-	}
-
-	public void setAllowedGlobalRoles(List<String> allowedGlobalRoles) {
-		this.allowedGlobalRoles = allowedGlobalRoles;
-	}
-}

backend/core/src/main/java/org/opencdmp/authorization/ClaimNames.java

@@ -1,9 +0,0 @@
-package org.opencdmp.authorization;
-
-public class ClaimNames {
-	public static final String ExternalProviderName = "ExternalProviderName";
-	public static final String TenantCodesClaimName = "TenantCodes";
-	public static final String TenantClaimName = "x-tenant";
-	public static final String GlobalRolesClaimName = "GlobalRoles";
-	public static final String TenantRolesClaimName = "TenantRoles";
-}

backend/core/src/main/java/org/opencdmp/authorization/OwnedAuthorizationRequirement.java

@@ -1,6 +0,0 @@
-package org.opencdmp.authorization;
-
-import gr.cite.commons.web.authz.policy.AuthorizationRequirement;
-
-public class OwnedAuthorizationRequirement implements AuthorizationRequirement {
-}

backend/core/src/main/java/org/opencdmp/authorization/OwnedResource.java

@@ -1,26 +0,0 @@
-package org.opencdmp.authorization;
-
-import gr.cite.commons.web.authz.policy.AuthorizationResource;
-
-import java.util.List;
-import java.util.UUID;
-
-public class OwnedResource extends AuthorizationResource {
-	private List<UUID> userIds;
-
-	public OwnedResource(UUID userId) {
-		this(List.of(userId));
-	}
-
-	public OwnedResource(List<UUID> userIds) {
-		this.userIds = userIds;
-	}
-
-	public List<UUID> getUserIds() {
-		return userIds;
-	}
-
-	public void setUserIds(List<UUID> userIds) {
-		this.userIds = userIds;
-	}
-}

backend/core/src/main/java/org/opencdmp/authorization/Permission.java

@@ -1,234 +0,0 @@
-package org.opencdmp.authorization;
-
-public final class Permission {
-	/////
-	public static String DeferredAffiliation = "DeferredAffiliation";
-
-	//Public
-	public static String PublicBrowseDescription = "PublicBrowseDescription";
-	public static String PublicBrowseDescriptionTemplate = "PublicBrowseDescriptionTemplate";
-	public static String PublicBrowseDmp = "PublicBrowseDmp";
-	public static String PublicBrowseDmpReference = "PublicBrowseDmpReference";
-	public static String PublicBrowseDmpUser = "PublicBrowseDmpUser";
-	public static String PublicBrowseReference = "PublicBrowseReference";
-	public static String PublicBrowseUser = "PublicBrowseUser";
-	public static String PublicBrowseDashboardStatistics = "PublicBrowseDashboardStatistics";
-	public static String PublicSendContactSupport = "PublicSendContactSupport";
-	public static String PublicBrowseReferenceType = "PublicBrowseReferenceType";
-	//Elastic
-	public static String ManageElastic = "ManageElastic";
-	//Queue Events
-	public static String ManageQueueEvents = "ManageQueueEvents";
-
-
-	//Deposit
-	public static String BrowseDeposit = "BrowseDeposit";
-	public static String EditDeposit = "BrowseDeposit";
-
-
-	//Language
-	public static String BrowseLanguage = "BrowseLanguage";
-	public static String EditLanguage = "EditLanguage";
-	public static String DeleteLanguage = "DeleteLanguage";
-
-
-	//NotificationTemplate
-	public static String BrowseNotificationTemplate = "BrowseNotificationTemplate";
-	public static String EditNotificationTemplate = "EditNotificationTemplate";
-	public static String DeleteNotificationTemplate = "DeleteNotificationTemplate";
-
-	//Language
-	public static String BrowseStatistics = "BrowseStatistics";
-	public static String BrowsePublicStatistics = "BrowsePublicStatistics";
-
-	//DescriptionTemplate
-	public static String BrowseDescriptionTemplate = "BrowseDescriptionTemplate";
-	public static String EditDescriptionTemplate = "EditDescriptionTemplate";
-	public static String DeleteDescriptionTemplate = "DeleteDescriptionTemplate";
-	public static String CloneDescriptionTemplate = "CloneDescriptionTemplate";
-	public static String CreateNewVersionDescriptionTemplate = "CreateNewVersionDescriptionTemplate";
-	public static String ImportDescriptionTemplate = "ImportDescriptionTemplate";
-	public static String ExportDescriptionTemplate = "ExportDescriptionTemplate";
-
-
-
-	//User
-	public static String BrowseUser = "BrowseUser";
-	public static String EditUser = "EditUser";
-	public static String DeleteUser = "DeleteUser";
-	public static String ExportUsers = "ExportUsers";
-	public static String EditTenantUserRole = "EditTenantUserRole";
-	public static String InviteTenantUser = "InviteTenantUser";
-	public static String BrowseDmpAssociatedUser = "BrowseDmpAssociatedUser";
-
-
-	//StorageFile
-	public static String BrowseStorageFile = "BrowseStorageFile";
-	public static String EditStorageFile = "EditStorageFile";
-	public static String DeleteStorageFile = "DeleteStorageFile";
-
-	//DescriptionTemplateType
-	public static String BrowseDescriptionTemplateType = "BrowseDescriptionTemplateType";
-	public static String EditDescriptionTemplateType = "EditDescriptionTemplateType";
-	public static String DeleteDescriptionTemplateType = "DeleteDescriptionTemplateType";
-
-	//Dmp
-	public static String BrowseDmp = "BrowseDmp";
-	public static String EditDmp = "EditDmp";
-	public static String NewDmp = "NewDmp";
-	public static String DepositDmp = "DepositDmp";
-	public static String DeleteDmp = "DeleteDmp";
-	public static String CloneDmp = "CloneDmp";
-	public static String ExportDmp = "ExportDmp";
-	public static String CreateNewVersionDmp = "CreateNewVersionDmp";
-	public static String FinalizeDmp = "FinalizeDmp";
-	public static String UndoFinalizeDmp = "UndoFinalizeDmp";
-	public static String AssignDmpUsers = "AssignDmpUsers";
-	public static String InviteDmpUsers = "InviteDmpUsers";
-
-	//DmpBlueprint
-	public static String BrowseDmpBlueprint = "BrowseDmpBlueprint";
-	public static String EditDmpBlueprint = "EditDmpBlueprint";
-	public static String DeleteDmpBlueprint = "DeleteDmpBlueprint";
-	public static String CloneDmpBlueprint = "CloneDmpBlueprint";
-	public static String CreateNewVersionDmpBlueprint = "CreateNewVersionDmpBlueprint";
-	public static String ExportDmpBlueprint = "ExportDmpBlueprint";
-	public static String ImportDmpBlueprint = "ImportDmpBlueprint";
-
-	//DmpDescriptionTemplate
-	public static String BrowseDmpDescriptionTemplate = "BrowseDmpDescriptionTemplate";
-	public static String EditDmpDescriptionTemplate = "EditDmpDescriptionTemplate";
-	public static String DeleteDmpDescriptionTemplate = "DeleteDmpDescriptionTemplate";
-
-	//DmpUser
-	public static String BrowseDmpUser = "BrowseDmpUser";
-	public static String EditDmpUser = "EditDmpUser";
-	public static String DeleteDmpUser = "DeleteDmpUser";
-
-	//Description
-	public static String BrowseDescription = "BrowseDescription";
-	public static String ReviewDescription = "ReviewDescription";
-	public static String EditDescription = "EditDescription";
-	public static String FinalizeDescription = "FinalizeDescription";
-	public static String DeleteDescription = "DeleteDescription";
-	public static String CloneDescription = "CloneDescription";
-	public static String ExportDescription = "ExportDescription";
-
-	//DescriptionTag
-	public static String BrowseDescriptionTag = "BrowseDescriptionTag";
-	public static String EditDescriptionTag = "EditDescriptionTag";
-	public static String DeleteDescriptionTag = "DeleteDescriptionTag";
-
-	//DescriptionTemplateType
-	public static String BrowseEntityDoi = "BrowseEntityDoi";
-	public static String EditEntityDoi = "EditEntityDoi";
-	public static String DeleteEntityDoi = "DeleteEntityDoi";
-
-	//UserSettings
-	public static String BrowseUserSettings = "BrowseUserSettings";
-	public static String EditUserSettings = "EditUserSettings";
-	public static String DeleteUserSettings = "DeleteUserSettings";
-
-
-
-	//Reference
-	public static String BrowseReference = "BrowseReference";
-	public static String BrowseExternalReference = "BrowseExternalReference";
-	public static String EditReference = "EditReference";
-	public static String DeleteReference = "DeleteReference";
-
-	//Tag
-	public static String BrowseTag = "BrowseTag";
-	public static String EditTag = "EditTag";
-	public static String DeleteTag = "DeleteTag";
-
-	//DmpReference
-	public static String BrowseDmpReference = "BrowseDmpReference";
-	public static String EditDmpReference = "EditDmpReference";
-	public static String DeleteDmpReference = "DeleteDmpReference";
-
-	//DescriptionReference
-	public static String BrowseDescriptionReference = "BrowseDescriptionReference";
-	public static String EditDescriptionReference = "EditDescriptionReference";
-	public static String DeleteDescriptionReference = "DeleteDescriptionReference";
-
-	//SupportiveMaterial
-	public static String BrowseSupportiveMaterial = "BrowseSupportiveMaterial";
-	public static String EditSupportiveMaterial= "EditSupportiveMaterial";
-	public static String DeleteSupportiveMaterial = "DeleteSupportiveMaterial";
-
-	//ReferenceType
-	public static String BrowseReferenceType = "BrowseReferenceType";
-	public static String EditReferenceType= "EditReferenceType";
-	public static String DeleteReferenceType = "DeleteReferenceType";
-
-	//Tenant
-	public static String BrowseTenant = "BrowseTenant";
-	public static String EditTenant= "EditTenant";
-	public static String DeleteTenant = "DeleteTenant";
-	public static String AllowNoTenant = "AllowNoTenant";
-
-	//TenantConfiguration
-	public static String BrowseTenantConfiguration = "BrowseTenantConfiguration";
-	public static String EditTenantConfiguration = "EditTenantConfiguration";
-	public static String DeleteTenantConfiguration = "DeleteTenantConfiguration";
-
-	//TenantUser
-	public static String BrowseTenantUser = "BrowseTenantUser";
-	public static String EditTenantUser = "EditTenantUser";
-	public static String DeleteTenantUser = "DeleteTenantUser";
-	
-	//Prefilling
-	public static String BrowsePrefilling = "BrowsePrefilling";
-	
-
-	//Lock
-	public static String BrowseLock = "BrowseLock";
-	public static String EditLock = "EditLock";
-	public static String DeleteLock = "DeleteLock";
-
-	//ContactSupport
-	public static String SendContactSupport = "SendContactSupport";
-
-	//ActionConfirmation
-	public static String BrowseActionConfirmation = "BrowseActionConfirmation";
-	public static String EditActionConfirmation = "EditActionConfirmation";
-	public static String DeleteActionConfirmation = "DeleteActionConfirmation";
-
-	//PrefillingSource
-	public static String BrowsePrefillingSource = "BrowsePrefillingSource";
-	public static String EditPrefillingSource= "EditPrefillingSource";
-	public static String DeletePrefillingSource = "DeletePrefillingSource";
-
-	//NotificationTemplate
-	public static String BrowseStatus = "BrowseStatus";
-	public static String EditStatus = "EditStatus";
-	public static String DeleteStatus = "DeleteStatus";
-
-
-	// UI Pages
-	public static String ViewDescriptionTemplateTypePage = "ViewDescriptionTemplateTypePage";
-	public static String ViewMaintenancePage = "ViewMaintenancePage";
-	public static String ViewNotificationPage = "ViewNotificationPage";
-	public static String ViewNotificationTemplatePage = "ViewNotificationTemplatePage";
-	public static String ViewSupportiveMaterialPage = "ViewSupportiveMaterialPage";
-	public static String ViewLanguagePage = "ViewLanguagePage";
-	public static String ViewUserPage = "ViewUserPage";
-	public static String ViewTenantUserPage = "ViewTenantUserPage";
-	public static String ViewTenantPage = "ViewTenantPage";
-	public static String ViewPrefillingSourcePage = "ViewPrefillingSourcePage";
-	public static String ViewReferenceTypePage = "ViewReferenceTypePage";
-	public static String ViewReferencePage = "ViewReferencePage";
-	public static String ViewEntityLockPage = "ViewEntityLockPage";
-	public static String ViewDescriptionTemplatePage = "ViewDescriptionTemplatePage";
-	public static String ViewDmpBlueprintPage = "ViewDmpBlueprintPage";
-	public static String ViewPublicDescriptionPage = "ViewPublicDescriptionPage";
-	public static String ViewPublicDmpPage = "ViewPublicDmpPage";
-	public static String ViewMyDescriptionPage = "ViewMyDescriptionPage";
-	public static String ViewMyDmpPage = "ViewMyDmpPage";
-	public static String ViewHomePage = "ViewHomePage";
-	public static String ViewMineInAppNotificationPage = "ViewMineInAppNotificationPage";
-	public static String ViewTenantConfigurationPage = "ViewTenantConfigurationPage";
-	public static String ViewStatusPage = "ViewStatusPage";
-
-}

backend/core/src/main/java/org/opencdmp/authorization/PermissionNameProvider.java

@@ -1,40 +0,0 @@
-package org.opencdmp.authorization;
-
-import org.opencdmp.convention.ConventionService;
-import org.opencdmp.service.deposit.DepositServiceImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Service;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
-public class PermissionNameProvider {
-	private static final Logger logger = LoggerFactory.getLogger(PermissionNameProvider.class);
-	private final List<String> permissions;
-
-	public PermissionNameProvider(ConventionService conventionService) {
-		this.permissions = new ArrayList<>();
-		Class<Permission> clazz = Permission.class;
-		for (Field f : clazz.getDeclaredFields()) {
-			if (Modifier.isStatic(f.getModifiers())) {
-				try {
-					Object value = f.get(null);
-					if (value != null && !conventionService.isNullOrEmpty((String)value)) this.permissions.add((String)value);
-				} catch (Exception e) {
-					logger.error("Can not load permission " + f.getName() + " " + e.getMessage());
-				}
-			}
-		}
-	}
-
-	public List<String> getPermissions() {
-		return permissions;
-	}
-}

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AffiliationCacheOptions.java

@@ -1,10 +0,0 @@
-package org.opencdmp.authorization.authorizationcontentresolver;
-
-import gr.cite.tools.cache.CacheOptions;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "cache.affiliation")
-public class AffiliationCacheOptions extends CacheOptions {
-}

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AffiliationCacheService.java

@@ -1,106 +0,0 @@
-package org.opencdmp.authorization.authorizationcontentresolver;
-
-import gr.cite.tools.cache.CacheService;
-import org.opencdmp.authorization.AffiliatedResource;
-import org.opencdmp.convention.ConventionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.UUID;
-
-@Service
-public class AffiliationCacheService extends CacheService<AffiliationCacheService.AffiliationCacheValue> {
-
-    public static class AffiliationCacheValue {
-
-        public AffiliationCacheValue() {
-        }
-
-        public AffiliationCacheValue(UUID tenantId, UUID userId, UUID entityId, String entityType, AffiliatedResource affiliatedResource) {
-            this.userId = userId;
-            this.tenantId = tenantId;
-            this.entityId = entityId;
-            this.entityType = entityType;
-            this.affiliatedResource = affiliatedResource;
-        }
-
-        private UUID userId;
-        private UUID tenantId;
-        private UUID entityId;
-        private String entityType;
-        private AffiliatedResource affiliatedResource;
-
-        public UUID getUserId() {
-            return this.userId;
-        }
-
-        public void setUserId(UUID userId) {
-            this.userId = userId;
-        }
-
-        public UUID getTenantId() {
-            return this.tenantId;
-        }
-
-        public void setTenantId(UUID tenantId) {
-            this.tenantId = tenantId;
-        }
-
-        public UUID getEntityId() {
-            return this.entityId;
-        }
-
-        public void setEntityId(UUID entityId) {
-            this.entityId = entityId;
-        }
-
-        public String getEntityType() {
-            return this.entityType;
-        }
-
-        public void setEntityType(String entityType) {
-            this.entityType = entityType;
-        }
-
-        public AffiliatedResource getAffiliatedResource() {
-            return this.affiliatedResource;
-        }
-
-        public void setAffiliatedResource(AffiliatedResource affiliatedResource) {
-            this.affiliatedResource = affiliatedResource;
-        }
-    }
-
-    private final ConventionService conventionService;
-    @Autowired
-    public AffiliationCacheService(AffiliationCacheOptions options, ConventionService conventionService) {
-        super(options);
-	    this.conventionService = conventionService;
-    }
-
-    @Override
-    protected Class<AffiliationCacheValue> valueClass() {
-        return AffiliationCacheValue.class;
-    }
-
-    @Override
-    public String keyOf(AffiliationCacheValue value) {
-        return this.buildKey(value.getTenantId(), value.getUserId(), value.getEntityId(), value.getEntityType());
-    }
-
-
-    public String buildKey(UUID tenantId, UUID userId, UUID entityId, String entityType) {
-        if (userId == null) throw new IllegalArgumentException("userId id is required");
-        if (entityId == null) throw new IllegalArgumentException("entityId id is required");
-        if (this.conventionService.isNullOrEmpty(entityType)) throw new IllegalArgumentException("entityType id is required");
-        
-        HashMap<String, String> keyParts = new HashMap<>();
-        keyParts.put("$user$", userId.toString().replace("-", "").toLowerCase(Locale.ROOT));
-        keyParts.put("$tenant$", tenantId == null ? "" : userId.toString().replace("-", "").toLowerCase(Locale.ROOT));
-        keyParts.put("$entity$", entityId.toString().replace("-", "").toLowerCase(Locale.ROOT));
-        keyParts.put("$type$", entityType);
-        return this.generateKey(keyParts);
-    }
-}

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AuthorizationContentResolver.java

@@ -1,29 +0,0 @@
-package org.opencdmp.authorization.authorizationcontentresolver;
-
-import org.opencdmp.authorization.AffiliatedResource;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-public interface AuthorizationContentResolver {
-	List<String> getPermissionNames();
-
-	AffiliatedResource dmpAffiliation(UUID id);
-
-	Map<UUID, AffiliatedResource> dmpsAffiliation(List<UUID> ids);
-
-	AffiliatedResource descriptionTemplateAffiliation(UUID id);
-
-	Map<UUID, AffiliatedResource> descriptionTemplateAffiliation(List<UUID> ids);
-
-	boolean hasAtLeastOneDescriptionTemplateAffiliation();
-
-	AffiliatedResource descriptionAffiliation(UUID id);
-
-	Map<UUID, AffiliatedResource> descriptionsAffiliation(List<UUID> ids);
-
-	AffiliatedResource descriptionsAffiliationBySection(UUID dmpId, UUID sectionId);
-
-	Map<UUID, AffiliatedResource> descriptionsAffiliationBySections(UUID dmpId, List<UUID> sectionIds);
-}

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AuthorizationContentResolverImpl.java

@@ -1,293 +0,0 @@
-package org.opencdmp.authorization.authorizationcontentresolver;
-
-import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.BaseFieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.opencdmp.authorization.AffiliatedResource;
-import org.opencdmp.authorization.PermissionNameProvider;
-import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.commons.scope.user.UserScope;
-import org.opencdmp.data.*;
-import org.opencdmp.model.DmpDescriptionTemplate;
-import org.opencdmp.model.DmpUser;
-import org.opencdmp.model.UserDescriptionTemplate;
-import org.opencdmp.model.description.Description;
-import org.opencdmp.query.DescriptionQuery;
-import org.opencdmp.query.DmpDescriptionTemplateQuery;
-import org.opencdmp.query.DmpUserQuery;
-import org.opencdmp.query.UserDescriptionTemplateQuery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.web.context.annotation.RequestScope;
-
-import javax.management.InvalidApplicationException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-@RequestScope
-public class AuthorizationContentResolverImpl implements AuthorizationContentResolver {
-	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(AuthorizationContentResolverImpl.class));
-	private static final Logger log = LoggerFactory.getLogger(AuthorizationContentResolverImpl.class);
-	private final QueryFactory queryFactory;
-	private final UserScope userScope;
-	private final TenantScope tenantScope;
-	private final AffiliationCacheService affiliationCacheService;
-	private final PermissionNameProvider permissionNameProvider;
-	private final TenantEntityManager tenantEntityManager;
-	public AuthorizationContentResolverImpl(QueryFactory queryFactory, UserScope userScope, TenantScope tenantScope, AffiliationCacheService affiliationCacheService, PermissionNameProvider permissionNameProvider, TenantEntityManager tenantEntityManager) {
-		this.queryFactory = queryFactory;
-		this.userScope = userScope;
-		this.tenantScope = tenantScope;
-		this.affiliationCacheService = affiliationCacheService;
-		this.permissionNameProvider = permissionNameProvider;
-		this.tenantEntityManager = tenantEntityManager;
-	}
-	
-	@Override
-	public List<String> getPermissionNames() {
-		return this.permissionNameProvider.getPermissions();
-	}
-
-	@Override
-	public AffiliatedResource dmpAffiliation(UUID id) {
-		return this.dmpsAffiliation(List.of(id)).getOrDefault(id, new AffiliatedResource());
-	}
-	@Override
-	public Map<UUID, AffiliatedResource> dmpsAffiliation(List<UUID> ids){
-		UUID userId = this.userScope.getUserIdSafe();
-		Map<UUID, AffiliatedResource> affiliatedResources = new HashMap<>();
-		for (UUID id : ids){
-			affiliatedResources.put(id, new AffiliatedResource());
-		}
-		if (userId == null || !this.userScope.isSet()) return affiliatedResources;
-
-		List<UUID> idsToResolve = this.getAffiliatedFromCache(ids, userId, affiliatedResources, DmpEntity.class.getSimpleName());
-		if (idsToResolve.isEmpty()) return affiliatedResources;
-		List<DmpUserEntity> dmpUsers;
-		try {
-			this.tenantEntityManager.loadExplictTenantFilters();
-			dmpUsers = this.queryFactory.query(DmpUserQuery.class).disableTracking().dmpIds(ids).sectionIsEmpty(true).userIds(userId).isActives(IsActive.Active).collectAs(new BaseFieldSet().ensure(DmpUser._role).ensure(DmpUser._dmp));
-		} catch (InvalidApplicationException e) {
-			log.error(e.getMessage(), e);
-			throw new MyApplicationException(e.getMessage());
-		} finally {
-			try {
-				this.tenantEntityManager.reloadTenantFilters();
-			} catch (InvalidApplicationException e) {
-				log.error(e.getMessage(), e);
-				throw new MyApplicationException(e.getMessage());
-			}
-		}
-		for (DmpUserEntity dmpUser : dmpUsers){
-			affiliatedResources.get(dmpUser.getDmpId()).getDmpUserRoles().add(dmpUser.getRole());
-		}
-
-		this.ensureAffiliatedInCache(idsToResolve, userId, affiliatedResources, DmpEntity.class.getSimpleName());
-		return affiliatedResources;
-	}
-
-	@Override
-	public AffiliatedResource descriptionTemplateAffiliation(UUID id) {
-		return this.descriptionTemplateAffiliation(List.of(id)).getOrDefault(id, new AffiliatedResource());
-	}
-
-	@Override
-	public Map<UUID, AffiliatedResource> descriptionTemplateAffiliation(List<UUID> ids){
-		UUID userId = this.userScope.getUserIdSafe();
-		Map<UUID, AffiliatedResource> affiliatedResources = new HashMap<>();
-		for (UUID id : ids){
-			affiliatedResources.put(id, new AffiliatedResource());
-		}
-		if (userId == null || !this.userScope.isSet()) return affiliatedResources;
-
-		List<UUID> idsToResolve = this.getAffiliatedFromCache(ids, userId, affiliatedResources, DescriptionTemplateEntity.class.getSimpleName());
-		if (idsToResolve.isEmpty()) return affiliatedResources;
-
-		List<UserDescriptionTemplateEntity> userDescriptionTemplates;
-		try {
-			this.tenantEntityManager.loadExplictTenantFilters();
-			userDescriptionTemplates = this.queryFactory.query(UserDescriptionTemplateQuery.class).disableTracking().descriptionTemplateIds(ids).userIds(userId).isActive(IsActive.Active).collectAs(new BaseFieldSet().ensure(UserDescriptionTemplate._role).ensure(UserDescriptionTemplate._descriptionTemplate));
-		} catch (InvalidApplicationException e) {
-			log.error(e.getMessage(), e);
-			throw new MyApplicationException(e.getMessage());
-		} finally {
-			try {
-				this.tenantEntityManager.reloadTenantFilters();
-			} catch (InvalidApplicationException e) {
-				log.error(e.getMessage(), e);
-				throw new MyApplicationException(e.getMessage());
-			}
-		}
-
-		for (UserDescriptionTemplateEntity dmpUser : userDescriptionTemplates){
-			affiliatedResources.get(dmpUser.getDescriptionTemplateId()).getUserDescriptionTemplateRoles().add(dmpUser.getRole());
-		}
-
-		this.ensureAffiliatedInCache(idsToResolve, userId, affiliatedResources, DescriptionTemplateEntity.class.getSimpleName());
-		return affiliatedResources;
-	}
-
-	@Override
-	public boolean hasAtLeastOneDescriptionTemplateAffiliation(){
-		UUID userId = this.userScope.getUserIdSafe();
-		if (userId == null || !this.userScope.isSet()) return false;
-
-		//TODO: investigate if we want to use cache 
-		boolean hasAny;
-		try {
-			this.tenantEntityManager.loadExplictTenantFilters();
-			hasAny = this.queryFactory.query(UserDescriptionTemplateQuery.class).disableTracking().userIds(userId).isActive(IsActive.Active).count() > 0;
-		} catch (InvalidApplicationException e) {
-			log.error(e.getMessage(), e);
-			throw new MyApplicationException(e.getMessage());
-		} finally {
-			try {
-				this.tenantEntityManager.reloadTenantFilters();
-			} catch (InvalidApplicationException e) {
-				log.error(e.getMessage(), e);
-				throw new MyApplicationException(e.getMessage());
-			}
-		}
-		
-		return hasAny;
-	}
-
-	@Override
-	public AffiliatedResource descriptionAffiliation(UUID id) {
-		return this.descriptionsAffiliation(List.of(id)).getOrDefault(id, new AffiliatedResource());
-	}
-	@Override
-	public Map<UUID, AffiliatedResource> descriptionsAffiliation(List<UUID> ids){
-		UUID userId = this.userScope.getUserIdSafe();
-		Map<UUID, AffiliatedResource> affiliatedResources = new HashMap<>();
-		for (UUID id : ids){
-			affiliatedResources.put(id, new AffiliatedResource());
-		}
-		if (userId == null || !this.userScope.isSet()) return affiliatedResources;
-
-		List<UUID> idsToResolve = this.getAffiliatedFromCache(ids, userId, affiliatedResources, DescriptionEntity.class.getSimpleName());
-		if (idsToResolve.isEmpty()) return affiliatedResources;
-
-		List<DmpDescriptionTemplateEntity> dmpDescriptionTemplateEntities;
-		List<DmpUserEntity> dmpUsers;
-		List<DescriptionEntity> descriptionEntities;
-		try {
-			this.tenantEntityManager.loadExplictTenantFilters();
-			descriptionEntities = this.queryFactory.query(DescriptionQuery.class).disableTracking().ids(ids).collectAs(new BaseFieldSet().ensure(Description._id).ensure(Description._dmpDescriptionTemplate).ensure(Description._dmp));
-			dmpDescriptionTemplateEntities = this.queryFactory.query(DmpDescriptionTemplateQuery.class).disableTracking().ids(descriptionEntities.stream().map(DescriptionEntity::getDmpDescriptionTemplateId).distinct().toList()).collectAs(new BaseFieldSet().ensure(DmpDescriptionTemplate._id).ensure(DmpDescriptionTemplate._sectionId));
-			dmpUsers = this.queryFactory.query(DmpUserQuery.class).disableTracking().descriptionIds(ids).userIds(userId).isActives(IsActive.Active).collectAs(new BaseFieldSet().ensure(DmpUser._role).ensure(DmpUser._sectionId).ensure(DmpUser._dmp));
-
-		} catch (InvalidApplicationException e) {
-			log.error(e.getMessage(), e);
-			throw new MyApplicationException(e.getMessage());
-		} finally {
-			try {
-				this.tenantEntityManager.reloadTenantFilters();
-			} catch (InvalidApplicationException e) {
-				log.error(e.getMessage(), e);
-				throw new MyApplicationException(e.getMessage());
-			}
-		}
-
-
-
-		Map<UUID, DmpDescriptionTemplateEntity> dmpDescriptionTemplateEntityMap = dmpDescriptionTemplateEntities == null ? new HashMap<>() : dmpDescriptionTemplateEntities.stream().collect(Collectors.toMap(DmpDescriptionTemplateEntity::getId, x-> x));
-		Map<UUID, List<DmpUserEntity>> dmpUsersMap = dmpUsers.stream().collect(Collectors.groupingBy(DmpUserEntity::getDmpId));
-		
-		for (DescriptionEntity description : descriptionEntities){
-			List<DmpUserEntity> dmpDescriptionUsers = dmpUsersMap.getOrDefault(description.getDmpId(), new ArrayList<>());
-			for (DmpUserEntity dmpUser : dmpDescriptionUsers) {
-				if (dmpUser.getSectionId() == null) affiliatedResources.get(description.getId()).getDmpUserRoles().add(dmpUser.getRole());
-				else {
-					DmpDescriptionTemplateEntity dmpDescriptionTemplateEntity = dmpDescriptionTemplateEntityMap.getOrDefault(description.getDmpDescriptionTemplateId(), null);
-					if (dmpDescriptionTemplateEntity != null && dmpUser.getSectionId().equals(dmpDescriptionTemplateEntity.getSectionId())){
-						affiliatedResources.get(description.getId()).getDmpUserRoles().add(dmpUser.getRole());
-					}
-				}
-			}
-		}
-
-		this.ensureAffiliatedInCache(idsToResolve, userId, affiliatedResources, DescriptionEntity.class.getSimpleName());
-		return affiliatedResources;
-	}
-
-	@Override
-	public AffiliatedResource descriptionsAffiliationBySection(UUID dmpId, UUID sectionId){
-		return this.descriptionsAffiliationBySections(dmpId, List.of(sectionId)).getOrDefault(sectionId, new AffiliatedResource());
-	}
-
-	@Override
-	public Map<UUID, AffiliatedResource> descriptionsAffiliationBySections(UUID dmpId, List<UUID> sectionIds){
-		UUID userId = this.userScope.getUserIdSafe();
-		Map<UUID, AffiliatedResource> affiliatedResources = new HashMap<>();
-		for (UUID id : sectionIds){
-			affiliatedResources.put(id, new AffiliatedResource());
-		}
-		if (userId == null || !this.userScope.isSet()) return affiliatedResources;
-
-
-		List<DmpUserEntity> dmpUsers;
-		try {
-			this.tenantEntityManager.loadExplictTenantFilters();
-			dmpUsers = this.queryFactory.query(DmpUserQuery.class).disableTracking().dmpIds(dmpId).userIds(userId).isActives(IsActive.Active).collectAs(new BaseFieldSet().ensure(DmpUser._role).ensure(DmpUser._sectionId).ensure(DmpUser._dmp));
-		} catch (InvalidApplicationException e) {
-			log.error(e.getMessage(), e);
-			throw new MyApplicationException(e.getMessage());
-		} finally {
-			try {
-				this.tenantEntityManager.reloadTenantFilters();
-			} catch (InvalidApplicationException e) {
-				log.error(e.getMessage(), e);
-				throw new MyApplicationException(e.getMessage());
-			}
-		}
-
-		for (UUID sectionId : sectionIds.stream().distinct().toList()){
-			List<DmpUserEntity> dmpSectionUsers = dmpUsers.stream().filter(x-> x.getSectionId() == null || x.getSectionId().equals(sectionId)).toList();
-			for (DmpUserEntity dmpUser : dmpSectionUsers) {
-				if (dmpUser.getSectionId() == null) affiliatedResources.get(sectionId).getDmpUserRoles().add(dmpUser.getRole());
-				else {
-					if (dmpUser.getSectionId().equals(sectionId)){
-						affiliatedResources.get(sectionId).getDmpUserRoles().add(dmpUser.getRole());
-					}
-				}
-			}
-		}
-
-		return affiliatedResources;
-	}
-
-	private List<UUID> getAffiliatedFromCache(List<UUID> ids, UUID userId, Map<UUID, AffiliatedResource> affiliatedResources, String entityType)  {
-		List<UUID> idsToResolve = new ArrayList<>();
-		for (UUID id : ids){
-			AffiliationCacheService.AffiliationCacheValue cacheValue = null;
-			try {
-				cacheValue = this.affiliationCacheService.lookup(this.affiliationCacheService.buildKey(this.tenantScope.isSet() ? this.tenantScope.getTenant(): null, userId, id, entityType));
-			} catch (InvalidApplicationException e) {
-				throw new RuntimeException(e);
-			}
-			if (cacheValue != null) affiliatedResources.put(id, cacheValue.getAffiliatedResource());
-			else  idsToResolve.add(id);
-		}
-		return idsToResolve;
-	}
-	
-	private void ensureAffiliatedInCache(List<UUID> idsToResolve, UUID userId, Map<UUID, AffiliatedResource> affiliatedResources, String entityType)  {
-		for (UUID id : idsToResolve){
-			AffiliatedResource affiliatedResource = affiliatedResources.getOrDefault(id, null);
-			if (affiliatedResource != null) {
-				AffiliationCacheService.AffiliationCacheValue cacheValue = null;
-				try {
-					cacheValue = new AffiliationCacheService.AffiliationCacheValue(this.tenantScope.isSet() ? this.tenantScope.getTenant(): null, userId, id, entityType, affiliatedResource);
-				} catch (InvalidApplicationException e) {
-					throw new RuntimeException(e);
-				}
-				this.affiliationCacheService.put(cacheValue);
-			}
-		}
-	}
-}

backend/core/src/main/java/org/opencdmp/commons/JsonHandlingService.java

@@ -1,56 +0,0 @@
-package org.opencdmp.commons;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-@Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
-public class JsonHandlingService {
-    private final ObjectMapper objectMapper;
-
-    public JsonHandlingService() {
-        this.objectMapper = new ObjectMapper();
-	    this.objectMapper.registerModule(new JavaTimeModule());
-    }
-
-    public String toJson(Object item) throws JsonProcessingException {
-        if (item == null) return null;
-        return this.objectMapper.writeValueAsString(item);
-    }
-
-    public String toJsonSafe(Object item) {
-        if (item == null) return null;
-        try {
-            return this.objectMapper.writeValueAsString(item);
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
-    public <T> T fromJson(Class<T> type, String json) throws JsonProcessingException {
-        if (json == null) return null;
-        return this.objectMapper.readValue(json, type);
-    }
-
-    public HashMap<String, String> mapFromJson(String json) throws JsonProcessingException {
-        ObjectReader reader = this.objectMapper.readerFor(Map.class);
-        return reader.readValue(json);
-    }
-
-    public <T> T fromJsonSafe(Class<T> type, String json) {
-        if (json == null) return null;
-        try {
-            return this.objectMapper.readValue(json, type);
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/XmlHandlingService.java

@@ -1,103 +0,0 @@
-package org.opencdmp.commons;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Marshaller;
-import jakarta.xml.bind.Unmarshaller;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.management.InvalidApplicationException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
-public class XmlHandlingService {
-
-    public String generateXml(Document doc) throws TransformerException {
-        TransformerFactory tFact = TransformerFactory.newInstance();
-        Transformer trans = tFact.newTransformer();
-        StringWriter writer = new StringWriter();
-        StreamResult result = new StreamResult(writer);
-        DOMSource source = new DOMSource(doc);
-        trans.setOutputProperty(OutputKeys.INDENT, "yes");
-        trans.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-        trans.transform(source, result);
-        return writer.toString();
-    }
-    
-    public String toXml(Object item) throws JAXBException {
-       
-        
-        JAXBContext context = JAXBContext.newInstance(item.getClass());
-        Marshaller marshaller = context.createMarshaller();
-        StringWriter out = new StringWriter();
-        marshaller.marshal(item, out);
-        return out.toString();
-    }
-
-    public String toXmlSafe(Object item) {
-        if (item == null) return null;
-        try {
-            return this.toXml(item);
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
-    public <T> T fromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
-        JAXBContext jaxbContext = JAXBContext.newInstance(type);
-        Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-
-        return (T) jaxbUnmarshaller.unmarshal(new StringReader(xmlString));
-    }
-
-    public <T> T fromXmlSafe(Class<T> type, String xmlString) {
-        if (xmlString == null) return null;
-        try {
-            return this.fromXml(type, xmlString);
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
-//    public <T extends XmlSerializable<T>> T xmlSerializableFromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
-//        T object = type.newInstance();
-//        return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
-//    }
-//    
-//    public <T extends XmlSerializable<T>> T xmlSerializableFromXmlSafe(Class<T> type, String xmlString) {
-//        if (xmlString == null) return null;
-//        try {
-//            return this.xmlSerializableFromXml(type, xmlString);
-//        } catch (Exception ex) {
-//            return null;
-//        }
-//    }
-
-    public Document getDocument(String xml) throws ParserConfigurationException, IOException, SAXException {
-        DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-        InputSource inputStream = new InputSource(new StringReader(xml));
-        return docBuilder.parse(inputStream);
-    }
-
-    public Document getDocument() throws ParserConfigurationException {
-        DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-        return docBuilder.newDocument();
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ActionConfirmationStatus.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum ActionConfirmationStatus implements DatabaseEnum<Short> {
-
-    Requested((short) 0),
-    Accepted((short) 1);
-
-    private final Short value;
-
-    ActionConfirmationStatus(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, ActionConfirmationStatus> map = EnumUtils.getEnumValueMap(ActionConfirmationStatus.class);
-
-    public static ActionConfirmationStatus of(Short i) {
-        return map.get(i);
-    }
-
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ActionConfirmationType.java

@@ -1,34 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum ActionConfirmationType implements DatabaseEnum<Short> {
-
-    MergeAccount((short) 0),
-    RemoveCredential((short) 1),
-    DmpInvitation((short) 2),
-    UserInviteToTenant ((short) 3);
-
-    private final Short value;
-
-    ActionConfirmationType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return this.value;
-    }
-
-    private static final Map<Short, ActionConfirmationType> map = EnumUtils.getEnumValueMap(ActionConfirmationType.class);
-
-    public static ActionConfirmationType of(Short i) {
-        return map.get(i);
-    }
-
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ContactInfoType.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum ContactInfoType implements DatabaseEnum<Short> {
-
-    Email((short) 0);
-
-    private final Short value;
-
-    ContactInfoType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, ContactInfoType> map = EnumUtils.getEnumValueMap(ContactInfoType.class);
-
-    public static ContactInfoType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DescriptionStatus.java

@@ -1,31 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DescriptionStatus implements DatabaseEnum<Short> {
-
-    Draft((short) 0),
-    Finalized((short) 1),
-    Canceled((short) 2);
-
-    private final Short value;
-
-    DescriptionStatus(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DescriptionStatus> map = EnumUtils.getEnumValueMap(DescriptionStatus.class);
-
-    public static DescriptionStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DescriptionTemplateStatus.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DescriptionTemplateStatus implements DatabaseEnum<Short> {
-
-    Draft((short) 0), 
-    Finalized((short) 1);
-
-    private final Short value;
-
-    DescriptionTemplateStatus(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DescriptionTemplateStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateStatus.class);
-
-    public static DescriptionTemplateStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DescriptionTemplateTypeStatus.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DescriptionTemplateTypeStatus implements DatabaseEnum<Short> {
-
-    Draft((short) 0), 
-    Finalized((short) 1);
-
-    private final Short value;
-
-    DescriptionTemplateTypeStatus(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DescriptionTemplateTypeStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateTypeStatus.class);
-
-    public static DescriptionTemplateTypeStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DescriptionTemplateVersionStatus.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DescriptionTemplateVersionStatus implements DatabaseEnum<Short> {
-
-    Current((short) 0),
-    Previous((short) 1),
-    NotFinalized((short) 2);
-
-    private final Short value;
-
-    DescriptionTemplateVersionStatus(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DescriptionTemplateVersionStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateVersionStatus.class);
-
-    public static DescriptionTemplateVersionStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DescriptionValidationOutput.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DescriptionValidationOutput implements DatabaseEnum<Short> {
-
-    Valid((short) 1),
-    Invalid((short) 2);
-
-    private final Short value;
-
-    DescriptionValidationOutput(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DescriptionValidationOutput> map = EnumUtils.getEnumValueMap(DescriptionValidationOutput.class);
-
-    public static DescriptionValidationOutput of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpAccessType.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpAccessType implements DatabaseEnum<Short> {
-
-    Public((short) 0), Restricted((short) 1);
-
-    private final Short value;
-
-    DmpAccessType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpAccessType> map = EnumUtils.getEnumValueMap(DmpAccessType.class);
-
-    public static DmpAccessType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpBlueprintExtraFieldDataType.java

@@ -1,45 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpBlueprintExtraFieldDataType implements DatabaseEnum<Short> {
-
-    Text((short) 0),
-    RichTex((short) 1),
-    Date((short) 2),
-    Number((short) 3),
-    ;
-
-    private final Short value;
-
-    DmpBlueprintExtraFieldDataType(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpBlueprintExtraFieldDataType> map = EnumUtils.getEnumValueMap(DmpBlueprintExtraFieldDataType.class);
-
-    public static DmpBlueprintExtraFieldDataType of(Short i) {
-        return map.get(i);
-    }
-
-    public static boolean isTextType(DmpBlueprintExtraFieldDataType fieldType){
-        return fieldType.equals(DmpBlueprintExtraFieldDataType.Text) || fieldType.equals(DmpBlueprintExtraFieldDataType.RichTex);
-    }
-
-    public static boolean isDateType(DmpBlueprintExtraFieldDataType fieldType){
-        return fieldType.equals(DmpBlueprintExtraFieldDataType.Date);
-    }
-
-    public static boolean isNumberType(DmpBlueprintExtraFieldDataType fieldType){
-        return fieldType.equals(DmpBlueprintExtraFieldDataType.Number);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpBlueprintFieldCategory.java

@@ -1,35 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpBlueprintFieldCategory implements DatabaseEnum<Short> {
-    System((short) 0),
-    Extra((short) 1),
-    ReferenceType((short) 2);
-
-    public static class Names {
-        public static final String System = "system";
-        public static final String Extra = "extra";
-        public static final String ReferenceType = "referenceType";
-    }
-
-    private final Short value;
-
-    DmpBlueprintFieldCategory(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpBlueprintFieldCategory> map = EnumUtils.getEnumValueMap(DmpBlueprintFieldCategory.class);
-
-    public static DmpBlueprintFieldCategory of(Short i) {
-        return map.get(i);
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpBlueprintStatus.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpBlueprintStatus implements DatabaseEnum<Short> {
-
-    Draft((short) 0),
-    Finalized((short) 1);
-
-    private final Short value;
-
-    DmpBlueprintStatus(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpBlueprintStatus> map = EnumUtils.getEnumValueMap(DmpBlueprintStatus.class);
-
-    public static DmpBlueprintStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpBlueprintSystemFieldType.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpBlueprintSystemFieldType implements DatabaseEnum<Short> {
-
-    Title((short)0),
-    Description((short)1),
-    Language((short)2),
-    Contact((short)3),
-    AccessRights((short)4),
-    User((short)5);
-    private final Short value;
-
-    DmpBlueprintSystemFieldType(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpBlueprintSystemFieldType> map = EnumUtils.getEnumValueMap(DmpBlueprintSystemFieldType.class);
-
-    public static DmpBlueprintSystemFieldType of(Short i) {
-        return map.get(i);
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpBlueprintVersionStatus.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpBlueprintVersionStatus implements DatabaseEnum<Short> {
-
-    Current((short) 0),
-    Previous((short) 1),
-    NotFinalized((short) 2);
-
-    private final Short value;
-
-    DmpBlueprintVersionStatus(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpBlueprintVersionStatus> map = EnumUtils.getEnumValueMap(DmpBlueprintVersionStatus.class);
-
-    public static DmpBlueprintVersionStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpStatus.java

@@ -1,31 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpStatus implements DatabaseEnum<Short> {
-
-    Draft((short) 0), Finalized((short) 1);
-
-    private final Short value;
-
-    DmpStatus(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpStatus> map = EnumUtils.getEnumValueMap(DmpStatus.class);
-
-    public static DmpStatus of(Short i) {
-        return map.get(i);
-    }
-
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpUserRole.java

@@ -1,33 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpUserRole implements DatabaseEnum<Short> {
-
-    Owner((short) 0),
-    Viewer((short) 1),
-    DescriptionContributor((short) 2),
-    Reviewer((short) 3);
-
-    private final Short value;
-
-    DmpUserRole(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return this.value;
-    }
-
-    private static final Map<Short, DmpUserRole> map = EnumUtils.getEnumValueMap(DmpUserRole.class);
-
-    public static DmpUserRole of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpValidationOutput.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpValidationOutput implements DatabaseEnum<Short> {
-
-    Valid((short) 1),
-    Invalid((short) 2);
-
-    private final Short value;
-
-    DmpValidationOutput(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpValidationOutput> map = EnumUtils.getEnumValueMap(DmpValidationOutput.class);
-
-    public static DmpValidationOutput of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/DmpVersionStatus.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum DmpVersionStatus implements DatabaseEnum<Short> {
-
-    Current((short) 0),
-    Previous((short) 1),
-    NotFinalized((short) 2);
-
-    private final Short value;
-
-    DmpVersionStatus(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, DmpVersionStatus> map = EnumUtils.getEnumValueMap(DmpVersionStatus.class);
-
-    public static DmpVersionStatus of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/EntityType.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum EntityType implements DatabaseEnum<Short> {
-
-    DMP((short) 0);
-
-    private final Short value;
-
-    EntityType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, EntityType> map = EnumUtils.getEnumValueMap(EntityType.class);
-
-    public static EntityType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/EnumUtils.java

@@ -1,16 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class EnumUtils {
-    public static  <EnumType extends Enum<EnumType> & DatabaseEnum<EnumValue>, EnumValue> Map<EnumValue, EnumType>  getEnumValueMap(Class<EnumType> enumType){
-        HashMap<EnumValue, EnumType> map = new HashMap<>();
-        for (EnumType v : enumType.getEnumConstants()) {
-            map.put(v.getValue(), v);
-        }
-        return map;
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ExternalFetcherApiHTTPMethodType.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-import jakarta.xml.bind.annotation.XmlEnumValue;
-
-import java.util.Map;
-
-public enum ExternalFetcherApiHTTPMethodType implements DatabaseEnum<Short> {
-	@XmlEnumValue(value = "0")
-	GET((short) 0),
-	@XmlEnumValue(value = "1")
-	POST((short) 1);
-	private final Short value;
-
-	ExternalFetcherApiHTTPMethodType(Short value) {
-		this.value = value;
-	}
-
-	@JsonValue
-	public Short getValue() {
-		return value;
-	}
-
-	private static final Map<Short, ExternalFetcherApiHTTPMethodType> map = EnumUtils.getEnumValueMap(ExternalFetcherApiHTTPMethodType.class);
-
-	public static ExternalFetcherApiHTTPMethodType of(Short i) {
-		return map.get(i);
-	}
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ExternalFetcherSourceType.java

@@ -1,35 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-import jakarta.xml.bind.annotation.XmlEnumValue;
-
-import java.util.Map;
-
-public enum ExternalFetcherSourceType implements DatabaseEnum<Short> {
-	@XmlEnumValue(value = "0")
-	API((short) 0),
-	@XmlEnumValue(value = "1")
-	STATIC((short) 1);
-	private final Short value;
-
-	public static class Names {
-		public static final String API = "api";
-		public static final String STATIC = "static";
-	}
-
-	ExternalFetcherSourceType(Short value) {
-		this.value = value;
-	}
-
-	@JsonValue
-	public Short getValue() {
-		return value;
-	}
-
-	private static final Map<Short, ExternalFetcherSourceType> map = EnumUtils.getEnumValueMap(ExternalFetcherSourceType.class);
-
-	public static ExternalFetcherSourceType of(Short i) {
-		return map.get(i);
-	}
-}

backend/core/src/main/java/org/opencdmp/commons/enums/FieldType.java

@@ -1,89 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum FieldType implements DatabaseEnum<String> {
-	SELECT(Names.Select),
-	BOOLEAN_DECISION(Names.BooleanDecision),
-	RADIO_BOX(Names.RadioBox),
-	INTERNAL_ENTRIES_DMPS(Names.InternalEntitiesDmps),
-	INTERNAL_ENTRIES_DESCRIPTIONS(Names.InternalEntitiesDescriptions),
-	CHECK_BOX(Names.CheckBox),
-	FREE_TEXT(Names.FreeText),
-	TEXT_AREA(Names.TextArea),
-	RICH_TEXT_AREA(Names.RichTextarea),
-	UPLOAD(Names.Upload),
-	DATE_PICKER(Names.DatePicker),
-	TAGS(Names.Tags),
-	REFERENCE_TYPES(Names.ReferenceTypes),
-	DATASET_IDENTIFIER(Names.DatasetIdentifier),
-	VALIDATION(Names.Validation);
-	private final String value;
-	
-	public static class Names {
-		public static final String Select = "select";
-		public static final String BooleanDecision = "booleanDecision";
-		public static final String RadioBox = "radiobox";
-		public static final String InternalEntitiesDmps = "internalEntitiesDmps";
-		public static final String InternalEntitiesDescriptions = "internalEntitiesDescriptions";
-		public static final String CheckBox = "checkBox";
-		public static final String FreeText = "freetext";
-		public static final String TextArea = "textarea";
-		public static final String RichTextarea = "richTextarea";
-		public static final String Upload = "upload";
-		public static final String DatePicker = "datePicker";
-		public static final String Tags = "tags";
-		public static final String DatasetIdentifier = "datasetIdentifier";
-		public static final String Validation = "validation";
-		public static final String ReferenceTypes = "referenceTypes";
-	}
-
-	FieldType(String value) {
-		this.value = value;
-	}
-
-	@JsonValue
-	public String getValue() {
-		return this.value;
-	}
-
-	private static final Map<String, FieldType> map = EnumUtils.getEnumValueMap(FieldType.class);
-
-	public static FieldType of(String i) {
-		return map.get(i);
-	}
-
-
-	public static boolean isReferenceType(FieldType fieldType){
-		return fieldType.equals(FieldType.REFERENCE_TYPES);
-	}
-
-	public static boolean isTextType(FieldType fieldType){
-		return  fieldType.equals(FieldType.FREE_TEXT)  || fieldType.equals(FieldType.TEXT_AREA) ||
-				fieldType.equals(FieldType.RICH_TEXT_AREA) || fieldType.equals(FieldType.UPLOAD) ||
-				fieldType.equals(FieldType.RADIO_BOX);
-	}
-
-	public static boolean isTextListType(FieldType fieldType){
-		return  fieldType.equals(FieldType.SELECT)  || fieldType.equals(FieldType.INTERNAL_ENTRIES_DMPS) ||
-				fieldType.equals(FieldType.INTERNAL_ENTRIES_DESCRIPTIONS);
-	}
-
-	public static boolean isTagType(FieldType fieldType){
-		return fieldType.equals(FieldType.TAGS);
-	}
-
-	public static boolean isDateType(FieldType fieldType){
-		return  fieldType.equals(FieldType.DATE_PICKER);
-	}
-	public static boolean isBooleanType(FieldType fieldType){
-		return  fieldType.equals(FieldType.BOOLEAN_DECISION) || fieldType.equals(FieldType.CHECK_BOX);
-	}
-
-	public static boolean isExternalIdentifierType(FieldType fieldType){
-		return  fieldType.equals(FieldType.VALIDATION) ||  fieldType.equals(FieldType.DATASET_IDENTIFIER) ;
-	}
-}

backend/core/src/main/java/org/opencdmp/commons/enums/FieldValidationType.java

@@ -1,33 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public enum FieldValidationType implements DatabaseEnum<Short> {
-
-    None((short) 0), 
-    Required((short) 1), 
-    Url((short) 2);
-
-    private final Short value;
-
-    FieldValidationType(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, FieldValidationType> map = EnumUtils.getEnumValueMap(FieldValidationType.class);
-
-    public static FieldValidationType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/IsActive.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum IsActive implements DatabaseEnum<Short> {
-
-    Inactive((short) 0),
-    Active((short) 1);
-
-    private final Short value;
-
-    IsActive(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, IsActive> map = EnumUtils.getEnumValueMap(IsActive.class);
-
-    public static IsActive of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/LockTargetType.java

@@ -1,29 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum LockTargetType implements DatabaseEnum<Short> {
-	Dmp((short) 0),
-	Description((short) 1),
-	DmpBlueprint((short) 2),
-	DescriptionTemplate((short) 3);
-	private final Short value;
-
-	LockTargetType(Short value) {
-		this.value = value;
-	}
-
-	@JsonValue
-	public Short getValue() {
-		return value;
-	}
-
-	private static final Map<Short, LockTargetType> map = EnumUtils.getEnumValueMap(LockTargetType.class);
-
-	public static LockTargetType of(Short i) {
-		return map.get(i);
-	}
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ProviderType.java

@@ -1,36 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ProviderType implements DatabaseEnum<Integer> {
-
-    Google (1), 
-    Facebook ( 2), 
-    Twitter ( 3), 
-    LinkedIn  (4), 
-    NativeLogin ( 5), 
-    B2Access  ( 6), 
-    ORCID  (7), 
-    OpenAire  ( 8), 
-    Configurable  ( 9), 
-    Zenodo   (10), 
-    Keycloack ( 128);
-
-    private final Integer value;
-
-    ProviderType(Integer value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Integer getValue() { return this.value; }
-
-    private static final Map<Integer, ProviderType> map = EnumUtils.getEnumValueMap(ProviderType.class);
-    public static ProviderType of(Integer i) {
-        return map.get(i);
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/RecentActivityItemType.java

@@ -1,31 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum RecentActivityItemType implements DatabaseEnum<Short> {
-
-    Dmp((short) 0),
-    Description((short) 1);
-
-    private final Short value;
-
-    RecentActivityItemType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, RecentActivityItemType> map = EnumUtils.getEnumValueMap(RecentActivityItemType.class);
-
-    public static RecentActivityItemType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/RecentActivityOrder.java

@@ -1,31 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum RecentActivityOrder implements DatabaseEnum<Short> {
-    UpdatedAt((short) 0),
-    Label((short) 1),
-    Status((short) 2);
-
-    private final Short value;
-
-    RecentActivityOrder(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, RecentActivityOrder> map = EnumUtils.getEnumValueMap(RecentActivityOrder.class);
-
-    public static RecentActivityOrder of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ReferenceFieldDataType.java

@@ -1,27 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum ReferenceFieldDataType implements DatabaseEnum<Short> {
-	Text((short) 0),
-	Date((short) 1);
-	private final Short value;
-
-	ReferenceFieldDataType(Short value) {
-		this.value = value;
-	}
-
-	@JsonValue
-	public Short getValue() {
-		return value;
-	}
-
-	private static final Map<Short, ReferenceFieldDataType> map = EnumUtils.getEnumValueMap(ReferenceFieldDataType.class);
-
-	public static ReferenceFieldDataType of(Short i) {
-		return map.get(i);
-	}
-}

backend/core/src/main/java/org/opencdmp/commons/enums/ReferenceSourceType.java

@@ -1,28 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum ReferenceSourceType implements DatabaseEnum<Short> {
-
-    Internal((short) 0),
-    External((short) 1);
-
-    private final Short value;
-
-    ReferenceSourceType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, ReferenceSourceType> map = EnumUtils.getEnumValueMap(ReferenceSourceType.class);
-
-    public static ReferenceSourceType of(Short i) {
-        return map.get(i);
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/StorageFilePermission.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum StorageFilePermission implements DatabaseEnum<Short> {
-
-    Read((short) 0),
-    Write((short) 1);
-
-    private final Short value;
-
-    StorageFilePermission(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, StorageFilePermission> map = EnumUtils.getEnumValueMap(StorageFilePermission.class);
-
-    public static StorageFilePermission of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/StorageType.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum StorageType implements DatabaseEnum<Short> {
-
-    Temp((short) 0),
-    Main((short) 1),
-    Transformer((short)2),
-    Deposit((short)3);
-
-    private final Short value;
-
-    StorageType(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, StorageType> map = EnumUtils.getEnumValueMap(StorageType.class);
-
-    public static StorageType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/SupportiveMaterialFieldType.java

@@ -1,32 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum SupportiveMaterialFieldType implements DatabaseEnum<Short> {
-
-    Faq((short) 0),
-    About((short) 1),
-    Glossary((short) 2),
-    TermsOfService((short) 3),
-    UserGuide((short) 4),
-    CookiePolicy((short) 5);
-
-    private final Short value;
-
-    SupportiveMaterialFieldType(Short value) {
-        this.value = value;
-    }
-
-    @Override
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, SupportiveMaterialFieldType> map = EnumUtils.getEnumValueMap(SupportiveMaterialFieldType.class);
-
-    public static SupportiveMaterialFieldType of(Short i) {
-        return map.get(i);
-    }
-}

backend/core/src/main/java/org/opencdmp/commons/enums/TenantConfigurationType.java

@@ -1,33 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum TenantConfigurationType implements DatabaseEnum<Short> {
-
-    DepositPlugins((short) 0),
-    FileTransformerPlugins((short) 1),
-    DefaultUserLocale((short) 2),
-    Logo((short) 3),
-    CssColors((short) 4);
-
-    private final Short value;
-
-    TenantConfigurationType(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, TenantConfigurationType> map = EnumUtils.getEnumValueMap(TenantConfigurationType.class);
-
-    public static TenantConfigurationType of(Short i) {
-        return map.get(i);
-    }
-
-}

backend/core/src/main/java/org/opencdmp/commons/enums/UserDescriptionTemplateRole.java

@@ -1,30 +0,0 @@
-package org.opencdmp.commons.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.opencdmp.data.converters.enums.DatabaseEnum;
-
-import java.util.Map;
-
-public enum UserDescriptionTemplateRole implements DatabaseEnum<Short> {
-
-    Owner((short) 0),
-    Member((short) 1);
-
-    private final Short value;
-
-    UserDescriptionTemplateRole(Short value) {
-        this.value = value;
-    }
-
-    @JsonValue
-    public Short getValue() {
-        return value;
-    }
-
-    private static final Map<Short, UserDescriptionTemplateRole> map = EnumUtils.getEnumValueMap(UserDescriptionTemplateRole.class);
-
-    public static UserDescriptionTemplateRole of(Short i) {
-        return map.get(i);
-    }
-
-}