Merge remote-tracking branch 'IQSS/develop' into IQSS/6993

IQSS · Aug 20, 2020 · 10c2fb7 · 10c2fb7
2 parents a792363 + fa33c7a
commit 10c2fb7
Show file tree

Hide file tree

Showing 69 changed files with 936 additions and 777 deletions.
diff --git a/conf/docker-aio/configure_doi.bash b/conf/docker-aio/configure_doi.bash
@@ -17,8 +17,8 @@ if [ ! -z "${doi_baseurl}" ]; then
         doi_baseurl_esc=`echo ${doi_baseurl} | sed -e 's/:/\\:/'`
         bin/asadmin create-jvm-options "\"-Ddoi.baseurlstring=${doi_baseurl_esc}\""
 fi
-if [ ! -z "${doi_mdcbaseurl}" ]; then
-        bin/asadmin delete-jvm-options "-Ddoi.mdcbaseurlstring=https\://api.test.datacite.org"
-        doi_mdcbaseurl_esc=`echo ${doi_mdcbaseurl} | sed -e 's/:/\\:/'`
-        bin/asadmin create-jvm-options "\"-Ddoi.mdcbaseurlstring=${doi_mdcbaseurl_esc}\""
+if [ ! -z "${doi_dataciterestapiurl}" ]; then
+        bin/asadmin delete-jvm-options "-Ddoi.dataciterestapiurlstring=https\://api.test.datacite.org"
+        doi_dataciterestapiurl_esc=`echo ${doi_dataciterestapiurl} | sed -e 's/:/\\:/'`
+        bin/asadmin create-jvm-options "\"-Ddoi.dataciterestapiurlstring=${doi_dataciterestapiurl_esc}\""
 fi
diff --git a/doc/release-notes/4529-download-by-dataset.md b/doc/release-notes/4529-download-by-dataset.md
diff --git a/doc/release-notes/4813-allow-duplicate-files.md b/doc/release-notes/4813-allow-duplicate-files.md
diff --git a/doc/release-notes/4977-facet-sort-setting b/doc/release-notes/4977-facet-sort-setting
diff --git a/doc/release-notes/5.0-release-notes.md b/doc/release-notes/5.0-release-notes.md
diff --git a/doc/release-notes/5093-datacite.md b/doc/release-notes/5093-datacite.md
diff --git a/doc/release-notes/6505-zipdownload-service.md b/doc/release-notes/6505-zipdownload-service.md
diff --git a/doc/release-notes/6545-solr-var-meta.md b/doc/release-notes/6545-solr-var-meta.md
diff --git a/doc/release-notes/6558-validate-files-on-publish.md b/doc/release-notes/6558-validate-files-on-publish.md
diff --git a/doc/release-notes/6634-primefaces-8.md b/doc/release-notes/6634-primefaces-8.md
diff --git a/doc/release-notes/6684-buttons b/doc/release-notes/6684-buttons
diff --git a/doc/release-notes/6895-payara-release-note b/doc/release-notes/6895-payara-release-note
diff --git a/doc/release-notes/6896-relpub-astro.md b/doc/release-notes/6896-relpub-astro.md
diff --git a/doc/release-notes/6918-publishing-lock.md b/doc/release-notes/6918-publishing-lock.md
diff --git a/doc/release-notes/6938-analytics-reload b/doc/release-notes/6938-analytics-reload
diff --git a/doc/release-notes/6956-shib-attribute-character-set-conversion.md b/doc/release-notes/6956-shib-attribute-character-set-conversion.md
diff --git a/doc/release-notes/6959-html-codebook.md b/doc/release-notes/6959-html-codebook.md
diff --git a/doc/release-notes/6961-payara-upgrade.md b/doc/release-notes/6961-payara-upgrade.md
diff --git a/doc/release-notes/6970-ip-addresses-behind-proxy b/doc/release-notes/6970-ip-addresses-behind-proxy
diff --git a/doc/release-notes/6980-datacite-reservation-upgrade.md b/doc/release-notes/6980-datacite-reservation-upgrade.md
diff --git a/doc/release-notes/7040-project-moves.md b/doc/release-notes/7040-project-moves.md
diff --git a/doc/release-notes/README.md b/doc/release-notes/README.md
@@ -5,7 +5,7 @@ doc/sphinx-guides/source/developers/making-releases.rst documents the official p
 - As a developer, I want to express in my pull request when an addition to the release notes will be necessary.
 - As a developer, I want to be aware of changes that should be made to my dev environment after a pull request has been merged. These could be Solr schema changes or curl commands to reload metadata blocks, for example.
 
-# release-notes directory process
+## release-notes Directory Process
 
 - Create a Markdown file named after your branch (assuming your branch starts with an issue number as requested in doc/sphinx-guides/source/developers/version-control.rst) such as "5053-apis-custom-homepage.md".
 - In the file you created, give instructions for non-SQL upgrade steps that must be taken to run the branch in your pull request. Examples include Solr schema updates or reloading metadata blocks. (SQL updates are handled separately as indicated in doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst.)

diff --git a/doc/sphinx-guides/source/_static/admin/ejb-jar.xml b/doc/sphinx-guides/source/_static/admin/ejb-jar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ejb-jar xmlns = "http://java.sun.com/xml/ns/javaee" 
-         version = "3.2"
+         version = "3.1"
          xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" 
          xsi:schemaLocation = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd">
     <enterprise-beans>

diff --git a/doc/sphinx-guides/source/admin/make-data-count.rst b/doc/sphinx-guides/source/admin/make-data-count.rst
@@ -142,7 +142,7 @@ Configuring Dataverse for Make Data Count Citations
 
 Please note: as explained in the note above about limitations, this feature is not available to installations of Dataverse that use Handles.
 
-To configure Dataverse to pull citations from the test vs. production DataCite server see :ref:`doi.mdcbaseurlstring` in the Installation Guide.
+To configure Dataverse to pull citations from the test vs. production DataCite server see :ref:`doi.dataciterestapiurlstring` in the Installation Guide.
 
 Please note that in the curl example, Bash environment variables are used with the idea that you can set a few environment variables and copy and paste the examples as is. For example, "$DOI" could become "doi:10.5072/FK2/BL2IBM" by issuing the following export command from Bash: