From 029181c4250c7aab297da59c5472e263f650397e Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 16 Nov 2023 12:22:44 +0100
Subject: [PATCH 1/4] fix: update link to faq (junit test only)

---
 .../tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java   | 3 +--
 dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java b/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
index bab4e76ac..0f31e567a 100644
--- a/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
+++ b/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
@@ -203,8 +203,7 @@ public class TestDHCrudServiceImpl {
   private static final String API_DOCUMENTATION = "https://api/documentation";
   private static final String MAIL_OF_CONTACT = "funk@sub.uni-goettingen.de";
   private static final String NAME_OF_CONTACT = "Stefan E. Funk";
-  private static final String FAQ_LOCATION =
-      "https://wiki.de.dariah.eu/display/publicde/FAQs+zum+DARIAH-DE+Repository";
+  private static final String FAQ_LOCATION = "https://faqs";
   private static final String IMPRINT_URL = "https://de.dariah.eu/impressum";
   private static final String PRIVACY_POLICY_URL = "https://de.dariah.eu/privacy-policy";
   private static final String CONTACT_URL = "https://de.dariah.eu/kontakt";
diff --git a/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html b/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html
index 9c76d5ed4..351e8532a 100644
--- a/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html
+++ b/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html
@@ -99,7 +99,7 @@
 												<a href="https://documentation" class="nav_link">Repository User Guide</a>
 											</li>
 											<li class="nav_item -level-3">
-												<a href="https://wiki.de.dariah.eu/display/publicde/FAQs+zum+DARIAH-DE+Repository" class="nav_link">Repository FAQ</a>
+												<a href="https://faqs" class="nav_link">Repository FAQ</a>
 											</li>
 											<li class="nav_item -level-3">
 												<a href="https://api/documentation" class="nav_link">Repository API Documentation</a>
-- 
GitLab


From f7f0d09be0e2544e3c77775503d043545c473c0d Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 16 Nov 2023 12:30:10 +0100
Subject: [PATCH 2/4] fix: fix link to terms of use in tombstone page

---
 dhcrud-base/src/main/resources/templates/tombstone.tmpl.html | 2 +-
 dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dhcrud-base/src/main/resources/templates/tombstone.tmpl.html b/dhcrud-base/src/main/resources/templates/tombstone.tmpl.html
index 3383acb10..f5100f416 100644
--- a/dhcrud-base/src/main/resources/templates/tombstone.tmpl.html
+++ b/dhcrud-base/src/main/resources/templates/tombstone.tmpl.html
@@ -209,7 +209,7 @@
                 </p>
 				<hr/>
 				<p>
-                    The dataset with identifier <a class="no_underline" href="{{doi_url}}/{{doi}}">{{doi_url}}/{{doi}}</a> is no longer available. It has been removed in compliance with the <a href="{{doi_url}}/{{doi}}">DARIAH-DE Terms of Use</a>.
+                    The dataset with identifier <a class="no_underline" href="{{doi_url}}/{{doi}}">{{doi_url}}/{{doi}}</a> is no longer available. It has been removed in compliance with the <a href="https://doi.org/10.20375/0000-000B-C8F0-4">DARIAH-DE Terms of Use</a>.
 				</p>
                 <p>
                     We apologise for the inconvenience.
diff --git a/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html b/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html
index 351e8532a..b735a066c 100644
--- a/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html
+++ b/dhcrud-base/src/test/resources/EXPECTED_TOMBSTONE_HTML.html
@@ -207,7 +207,7 @@
                 </p>
 				<hr/>
 				<p>
-                    The dataset with identifier <a class="no_underline" href="https://dx.doi.org/10.20375/0000-001B-41BD-5">https://dx.doi.org/10.20375/0000-001B-41BD-5</a> is no longer available. It has been removed in compliance with the <a href="https://dx.doi.org/10.20375/0000-001B-41BD-5">DARIAH-DE Terms of Use</a>.
+                    The dataset with identifier <a class="no_underline" href="https://dx.doi.org/10.20375/0000-001B-41BD-5">https://dx.doi.org/10.20375/0000-001B-41BD-5</a> is no longer available. It has been removed in compliance with the <a href="https://doi.org/10.20375/0000-000B-C8F0-4">DARIAH-DE Terms of Use</a>.
 				</p>
                 <p>
                     We apologise for the inconvenience.
-- 
GitLab


From dece133385a74f5414cbbff324a0e61fc09b4b6f Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 16 Nov 2023 13:01:15 +0100
Subject: [PATCH 3/4] fix: fix all still missing refs

---
 CONTRIBUTING.md                                                 | 2 +-
 README.md                                                       | 2 +-
 .../tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java    | 2 +-
 .../src/test/resources/EXPECTED_LANDING_HTML_DATAOBJECT.html    | 2 +-
 .../test/resources/EXPECTED_LANDING_HTML_ROOTCOLLECTION.html    | 2 +-
 .../src/test/resources/EXPECTED_LANDING_HTML_SUBCOLLECTION.html | 2 +-
 dhcrud-webapp/conf/dhcrud.properties                            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 147e25aec..940f03f27 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ If you want to contribute to the DARIAH-DE-CRUD Services, please
 
 7. Then file a [merge request in the GitLab GUI](https://gitlab.gwdg.de/dariah-de/dariah-de-crud-services/-/merge_requests/new) from your new branch (src) to the develop branch (dest).
 
-8. If you are a maintainer, please take the [DARIAH-DE Release Workflow](https://wiki.de.dariah.eu/display/DARIAH3/DARIAH-DE+Release+Management#DARIAHDEReleaseManagement-Gitlabflow/Gitflow(develop,main,featurebranchesundtags)) into account.
+8. If you are a maintainer, please take the [DARIAH-DE Release Workflow](https://projects.academiccloud.de/projects/dariah-de-intern/wiki/dariah-de-release-management) into account.
 
 ## Reporting an issue
 
diff --git a/README.md b/README.md
index 4e3311d14..e1c272ce1 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ The service is deployed just by installing the appropriate Docker container.
 
 ## Releasing a new version
 
-For releasing a new version of TG-crud or DH-crud, please have a look at the [DARIAH-DE Release Management Page](https://wiki.de.dariah.eu/display/DARIAH3/DARIAH-DE+Release+Management#DARIAHDEReleaseManagement-Gitlabflow/Gitflow(develop,main,featurebranchesundtags)) or see the [Gitlab CI file](.gitlab-ci.yml).
+For releasing a new version of TG-crud or DH-crud, please have a look at the [DARIAH-DE Release Management Page](https://projects.academiccloud.de/projects/dariah-de-intern/wiki/dariah-de-release-management) or see the [Gitlab CI file](.gitlab-ci.yml).
 
 ## Large file handling
 
diff --git a/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java b/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
index 0f31e567a..43d2fdece 100644
--- a/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
+++ b/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
@@ -394,7 +394,7 @@ public class TestDHCrudServiceImpl {
       System.out.println(OK);
     } else {
       System.out.println(FAILED);
-      // System.out.println("EXPECTED:\n" + expectedLandingHtmlDataObject);
+       System.out.println("EXPECTED:\n" + expectedLandingHtmlDataObject);
       System.out.println("CREATED:\n" + landingHTML);
       assertTrue(false);
     }
diff --git a/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_DATAOBJECT.html b/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_DATAOBJECT.html
index 01c2514b1..5edb8c469 100644
--- a/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_DATAOBJECT.html
+++ b/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_DATAOBJECT.html
@@ -151,7 +151,7 @@
 												<a href="https://documentation" class="nav_link">Repository User Guide</a>
 											</li>
 											<li class="nav_item -level-3">
-												<a href="https://wiki.de.dariah.eu/display/publicde/FAQs+zum+DARIAH-DE+Repository" class="nav_link">Repository FAQ</a>
+												<a href="https://faqs" class="nav_link">Repository FAQ</a>
 											</li>
 											<li class="nav_item -level-3">
 												<a href="https://api/documentation" class="nav_link">Repository API Documentation</a>
diff --git a/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_ROOTCOLLECTION.html b/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_ROOTCOLLECTION.html
index 0666421c2..657bc6121 100644
--- a/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_ROOTCOLLECTION.html
+++ b/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_ROOTCOLLECTION.html
@@ -151,7 +151,7 @@
 												<a href="https://documentation" class="nav_link">Repository User Guide</a>
 											</li>
 											<li class="nav_item -level-3">
-												<a href="https://wiki.de.dariah.eu/display/publicde/FAQs+zum+DARIAH-DE+Repository" class="nav_link">Repository FAQ</a>
+												<a href="https://faqs" class="nav_link">Repository FAQ</a>
 											</li>
 											<li class="nav_item -level-3">
 												<a href="https://api/documentation" class="nav_link">Repository API Documentation</a>
diff --git a/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_SUBCOLLECTION.html b/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_SUBCOLLECTION.html
index 3aa6131dd..7cde27d62 100644
--- a/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_SUBCOLLECTION.html
+++ b/dhcrud-base/src/test/resources/EXPECTED_LANDING_HTML_SUBCOLLECTION.html
@@ -151,7 +151,7 @@
 												<a href="https://documentation" class="nav_link">Repository User Guide</a>
 											</li>
 											<li class="nav_item -level-3">
-												<a href="https://wiki.de.dariah.eu/display/publicde/FAQs+zum+DARIAH-DE+Repository" class="nav_link">Repository FAQ</a>
+												<a href="https://faqs" class="nav_link">Repository FAQ</a>
 											</li>
 											<li class="nav_item -level-3">
 												<a href="https://api/documentation" class="nav_link">Repository API Documentation</a>
diff --git a/dhcrud-webapp/conf/dhcrud.properties b/dhcrud-webapp/conf/dhcrud.properties
index 84e90d7b4..0615e2b53 100644
--- a/dhcrud-webapp/conf/dhcrud.properties
+++ b/dhcrud-webapp/conf/dhcrud.properties
@@ -26,7 +26,7 @@ PUBLIKATOR_LOCATION = http://repository.de.dariah.eu/publikator
 NAME_OF_CONTACT = DARIAH-DE
 MAIL_OF_CONTACT = support@de.dariah.eu
 # The location of the repository's FAQ.
-FAQ_LOCATION = https://wiki.de.dariah.eu/display/publicde/FAQs+zum+DARIAH-DE+Repository
+FAQ_LOCATION = https://doc.de.dariah.eu/FAQs-zum-DARIAH-DE-Repository/
 # Link to DataCite DOI metadata.
 DATACITE_LOCATION = https://commons.datacite.org/doi.org/
 # Link to Digilib service.
-- 
GitLab


From 5ed7f5f356e771f0fdf9d181deb1f0a173dc1aa6 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 16 Nov 2023 13:05:01 +0100
Subject: [PATCH 4/4] test: remove comment

---
 .../tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java b/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
index 43d2fdece..0f31e567a 100644
--- a/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
+++ b/dhcrud-base/src/test/java/info/textgrid/namespaces/middleware/tgcrud/services/tgcrudservice/TestDHCrudServiceImpl.java
@@ -394,7 +394,7 @@ public class TestDHCrudServiceImpl {
       System.out.println(OK);
     } else {
       System.out.println(FAILED);
-       System.out.println("EXPECTED:\n" + expectedLandingHtmlDataObject);
+      // System.out.println("EXPECTED:\n" + expectedLandingHtmlDataObject);
       System.out.println("CREATED:\n" + landingHTML);
       assertTrue(false);
     }
-- 
GitLab