Merge pull request #2888 from dzhw/release

Release v1.0.110
dzhw · May 31, 2021 · 0f9ead8 · 0f9ead8
2 parents 8ca4caf + be7f650
commit 0f9ead8
Show file tree

Hide file tree

Showing 69 changed files with 1,367 additions and 1,459 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -398,7 +398,7 @@ module.exports = function(grunt) {
       uglify: {
         options: {
           compress: {
-            unused: false
+            unused: false,
           }
         }
         // src and dest is configured in a subtask called "generated" by

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ On Windows, `patch.exe` has to exist in the PATH. It is distributed as part of g
 
 Before starting the app on your local machine you need to start the following Document Stores:
 1. Mongodb: Mongodb must be running on the default port, on ubuntu you should install it from [here](https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/)
-2. Elasticsearch (7.12.0): Elasticsearch must be running on its default port. You can download it from [here](https://www.elastic.co/downloads/elasticsearch)
+2. Elasticsearch (7.12.1): Elasticsearch must be running on its default port. You can download it from [here](https://www.elastic.co/downloads/elasticsearch)
 
 Make sure that you have read-write-access on the ***data*** directory (in your project directory) for Elasticsearch.
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     ports:
       - "27017:27017"
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.12.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.12.1
     container_name: elasticsearch
     environment:
       - discovery.type=single-node

diff --git a/...hw/fdz/metadatamanagement/datapackagemanagement/domain/MetadataExportFormat.rst b/...hw/fdz/metadatamanagement/datapackagemanagement/domain/MetadataExportFormat.rst
@@ -0,0 +1,108 @@
+.. java:import:: java.util Set
+
+MetadataExportFormat
+====================
+
+.. java:package:: eu.dzhw.fdz.metadatamanagement.datapackagemanagement.domain
+   :noindex:
+
+.. java:type:: public enum MetadataExportFormat
+
+   Formats to which our metadata can be exported. The actual mapping is either powered by da|ra's OAI-PMH service or data cite.
+
+   :author: René Reitmann
+
+Enum Constants
+--------------
+dara
+^^^^
+
+.. java:field:: public static final MetadataExportFormat dara
+   :outertype: MetadataExportFormat
+
+data_cite_json
+^^^^^^^^^^^^^^
+
+.. java:field:: public static final MetadataExportFormat data_cite_json
+   :outertype: MetadataExportFormat
+
+data_cite_xml
+^^^^^^^^^^^^^
+
+.. java:field:: public static final MetadataExportFormat data_cite_xml
+   :outertype: MetadataExportFormat
+
+mds
+^^^
+
+.. java:field:: public static final MetadataExportFormat mds
+   :outertype: MetadataExportFormat
+
+oai_dara
+^^^^^^^^
+
+.. java:field:: public static final MetadataExportFormat oai_dara
+   :outertype: MetadataExportFormat
+
+oai_dc
+^^^^^^
+
+.. java:field:: public static final MetadataExportFormat oai_dc
+   :outertype: MetadataExportFormat
+
+oai_ddi31
+^^^^^^^^^
+
+.. java:field:: public static final MetadataExportFormat oai_ddi31
+   :outertype: MetadataExportFormat
+
+oai_ddi32
+^^^^^^^^^
+
+.. java:field:: public static final MetadataExportFormat oai_ddi32
+   :outertype: MetadataExportFormat
+
+schema_org_json_ld
+^^^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final MetadataExportFormat schema_org_json_ld
+   :outertype: MetadataExportFormat
+
+Fields
+------
+DATACITE_FORMATS
+^^^^^^^^^^^^^^^^
+
+.. java:field:: public static final Set<MetadataExportFormat> DATACITE_FORMATS
+   :outertype: MetadataExportFormat
+
+   Export formats powered by data cite.
+
+   **See also:** :java:ref:`https://commons.datacite.org/doi.org/10.21249/dzhw:gra2005:1.0.0`
+
+OAI_FORMATS
+^^^^^^^^^^^
+
+.. java:field:: public static final Set<MetadataExportFormat> OAI_FORMATS
+   :outertype: MetadataExportFormat
+
+   Export formats powered by da|ra's OAI-PMH service.
+
+   **See also:** :java:ref:`https://www.da-ra.de/oaip/`
+
+fileExtension
+^^^^^^^^^^^^^
+
+.. java:field:: public final String fileExtension
+   :outertype: MetadataExportFormat
+
+   The file extension for the downloaded format (xml or json).
+
+urlFormat
+^^^^^^^^^
+
+.. java:field:: public final String urlFormat
+   :outertype: MetadataExportFormat
+
+   The format as it can be used in URLs.
+
diff --git a/...c/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/package-index.rst b/...c/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/domain/package-index.rst
@@ -11,6 +11,7 @@ Domain objects describing \ :java:ref:`eu.dzhw.fdz.metadatamanagement.datapackag
    DataPackage
    DataPackageAttachmentMetadata
    DataPackageAttachmentTypes
+   MetadataExportFormat
    MethodReportCitationDetails
    SurveyDesigns
    Tags

diff --git a/...javadoc/eu/dzhw/fdz/metadatamanagement/variablemanagement/domain/AccessWays.rst b/...javadoc/eu/dzhw/fdz/metadatamanagement/variablemanagement/domain/AccessWays.rst
@@ -4,6 +4,8 @@
 
 .. java:import:: java.util HashSet
 
+.. java:import:: java.util List
+
 .. java:import:: java.util Set
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.datasetmanagement.domain DataSet
@@ -23,7 +25,7 @@ Fields
 ALL
 ^^^
 
-.. java:field:: public static final Set<String> ALL
+.. java:field:: public static final List<String> ALL
    :outertype: AccessWays
 
 DOWNLOAD_CUF